From b9d928efd9efd2dc24b2b6aef47e858b326c9699 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Mon, 6 Feb 2012 20:30:01 +0400
Subject: [PATCH] --- yaml --- r: 288923 b: refs/heads/master c:
 9823ec9ded836ee7ca4fe5ab7964b9cdc8af010c h: refs/heads/master i:   288921:
 51c007c9cd41f3e565a105ab5852014d975a7cb3   288919:
 db8d757d6ee12397cc54df29e4b571a436240b52 v: v3

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

diff --git a/[refs] b/[refs]
index 68e297816ffc..9a08ae088102 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 353416099128914a684e8bb81e7475d8c2961cc3
+refs/heads/master: 9823ec9ded836ee7ca4fe5ab7964b9cdc8af010c
diff --git a/trunk/drivers/staging/android/lowmemorykiller.c b/trunk/drivers/staging/android/lowmemorykiller.c
index 6e800d35ebda..ae38c39a1525 100644
--- a/trunk/drivers/staging/android/lowmemorykiller.c
+++ b/trunk/drivers/staging/android/lowmemorykiller.c
@@ -138,6 +138,9 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
 		struct task_struct *p;
 		int oom_adj;
 
+		if (tsk->flags & PF_KTHREAD)
+			continue;
+
 		p = find_lock_task_mm(tsk);
 		if (!p)
 			continue;