From 011de05c4dbd72f05b05833df146edcc07463312 Mon Sep 17 00:00:00 2001
From: Corentin Chary <corentincj@iksaif.net>
Date: Sat, 28 Nov 2009 09:45:14 +0100
Subject: [PATCH] --- yaml --- r: 281194 b: refs/heads/master c:
 23687af9317c9c01d4609667d3566af7f5e71e65 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/android/logger.c          | 1 +
 trunk/drivers/staging/android/lowmemorykiller.c | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2bac0618665e..3c4a70ffdeb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 355b0502f6efea0ff9492753888772c96972d2a3
+refs/heads/master: 23687af9317c9c01d4609667d3566af7f5e71e65
diff --git a/trunk/drivers/staging/android/logger.c b/trunk/drivers/staging/android/logger.c
index 6c10b456c6cc..64cc2a1e7b16 100644
--- a/trunk/drivers/staging/android/logger.c
+++ b/trunk/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/trunk/drivers/staging/android/lowmemorykiller.c b/trunk/drivers/staging/android/lowmemorykiller.c
index 935d281a201a..32314e85e2b7 100644
--- a/trunk/drivers/staging/android/lowmemorykiller.c
+++ b/trunk/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;