---

yaml --- r: 198725 b: refs/heads/master c: df64f81 h: refs/heads/master i: 198723: 9bf43e5 v: v3
git-mirror · May 27, 2010 · 7abd455 · 7abd455
1 parent e64392b
commit 7abd455
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc10e281f5fc42e288ab979294d1d5dc9743ae1b
+refs/heads/master: df64f81bb1e01cbef967a96642dacf208acb7e72
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -479,12 +479,9 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
 	read_lock(&tasklist_lock);
 retry:
 	p = select_bad_process(&points, mem);
-	if (PTR_ERR(p) == -1UL)
+	if (!p || PTR_ERR(p) == -1UL)
 		goto out;
 
-	if (!p)
-		p = current;
-
 	if (oom_kill_process(p, gfp_mask, 0, points, mem,
 				"Memory cgroup out of memory"))
 		goto retry;