From 0b23510cd3aef679ac1dba2637c02a2ad392e6b9 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Mon, 9 Aug 2010 17:19:34 -0700
Subject: [PATCH] --- yaml --- r: 207253 b: refs/heads/master c:
 2c5ea53ce46ebb232e0d9a475fdd2b166d2a516b h: refs/heads/master i:   207251:
 f949ee6f3b5606ad9a1cfd4cf94f9efae02f7caa v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4ebc12997fc2..31689c4defc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c59aec830c7ed6c745bd513982cee3563ed20c1
+refs/heads/master: 2c5ea53ce46ebb232e0d9a475fdd2b166d2a516b
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 6e9f16a910e0..b9816ea2eb8f 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -467,6 +467,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 
 			if (child->mm == p->mm)
 				continue;
+			if (child->flags & PF_KTHREAD)
+				continue;
 			if (mem && !task_in_mem_cgroup(child, mem))
 				continue;
 			if (!has_intersects_mems_allowed(child, nodemask))