X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=4748b906aff23451c9bbf838ddc1add16bbf1cc9;hb=5be196e5f925dab2309530fabce69c2e562b9791;hp=d348b9035955e5a0ba91af683880ac0e41996fd0;hpb=3168c31abe0c11fd3edcefa110d6f590fe8c909f;p=karo-tx-linux.git

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index d348b9035955..4748b906aff2 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);
 }