---

yaml --- r: 207253 b: refs/heads/master c: 2c5ea53 h: refs/heads/master i: 207251: f949ee6 v: v3
git-mirror · Aug 10, 2010 · 0b23510 · 0b23510
1 parent 9283eb8
commit 0b23510
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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))