X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=709aedfaa014946664f2b83857b749d92f79752f;hb=129961ecaf21c9ee899ad9067d917c1aa172fb7a;hp=b68e802a7a7d6961a0c1f7709a9cc606d022371c;hpb=d3b383338f105f50724c10a7d81b04a3930e886b;p=~andy%2Flinux

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b68e802a7a7..709aedfaa01 100644
--- a/mm/oom_kill.c
+++ b/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;