--- ./mm/oom_kill.c.oomkill	2006-01-06 15:16:45.000000000 +0300
+++ ./mm/oom_kill.c	2006-01-06 15:19:21.130652864 +0300
@@ -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);
 }