X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=4748b906aff23451c9bbf838ddc1add16bbf1cc9;hb=3e0d98b9f1eb757fc98efc84e74e54a08308aa73;hp=d348b9035955e5a0ba91af683880ac0e41996fd0;hpb=a1e78db3f54d3481726ed2d3d58d8ad5b19b13d0;p=linux-2.6-omap-h63xx.git

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index d348b903595..4748b906aff 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -298,7 +298,8 @@ retry:
 
 	/*
 	 * Give "p" a good chance of killing itself before we
-	 * retry to allocate memory.
+	 * retry to allocate memory unless "p" is current
 	 */
-	schedule_timeout_interruptible(1);
+	if (!test_thread_flag(TIF_MEMDIE))
+		schedule_timeout_interruptible(1);
 }