---

yaml --- r: 16855 b: refs/heads/master c: 2f659f4 h: refs/heads/master i: 16853: 7e35477 16851: bda2918 16847: a9696e3 v: v3
git-mirror · Jan 9, 2006 · 81e9454 · 81e9454
1 parent daa3571
commit 81e9454
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce3c4c0ff62ca6391019b7832fb41a7f28b9e26
+refs/heads/master: 2f659f462d2ab519068d0e2bb677d7a700decb8d
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -298,7 +298,8 @@ void out_of_memory(gfp_t gfp_mask, int order)
 
 	/*
 	 * 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);
 }