| From 23687af9317c9c01d4609667d3566af7f5e71e65 Mon Sep 17 00:00:00 2001 |
| From: Corentin Chary <corentincj@iksaif.net> |
| Date: Sat, 28 Nov 2009 09:45:14 +0100 |
| Subject: staging/android: fix build issues |
| Patch-mainline: HEAD |
| Git-commit: 23687af9317c9c01d4609667d3566af7f5e71e65 |
| |
| Signed-off-by: Corentin Chary <corentincj@iksaif.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c |
| index 6c10b45..64cc2a1 100644 |
| --- a/drivers/staging/android/logger.c |
| +++ b/drivers/staging/android/logger.c |
| @@ -17,6 +17,7 @@ |
| * GNU General Public License for more details. |
| */ |
| |
| +#include <linux/sched.h> |
| #include <linux/module.h> |
| #include <linux/fs.h> |
| #include <linux/miscdevice.h> |
| diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c |
| index 935d281..32314e8 100644 |
| --- a/drivers/staging/android/lowmemorykiller.c |
| +++ b/drivers/staging/android/lowmemorykiller.c |
| @@ -100,15 +100,17 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) |
| read_lock(&tasklist_lock); |
| for_each_process(p) { |
| struct mm_struct *mm; |
| + struct signal_struct *sig; |
| int oom_adj; |
| |
| task_lock(p); |
| mm = p->mm; |
| - if (!mm) { |
| + sig = p->signal; |
| + if (!mm || !sig) { |
| task_unlock(p); |
| continue; |
| } |
| - oom_adj = mm->oom_adj; |
| + oom_adj = sig->oom_adj; |
| if (oom_adj < min_adj) { |
| task_unlock(p); |
| continue; |