From 81e9454c62b2ffa14825d694e525cdd353c97465 Mon Sep 17 00:00:00 2001
From: Kirill Korotaev <dev@sw.ru>
Date: Sun, 8 Jan 2006 01:01:05 -0800
Subject: [PATCH] --- yaml --- r: 16855 b: refs/heads/master c:
 2f659f462d2ab519068d0e2bb677d7a700decb8d h: refs/heads/master i:   16853:
 7e35477423db83156b71c4617b3c691a8355fd89   16851:
 bda2918951c029eb1b745c822fdafec5564e90c8   16847:
 a9696e3ee43fb1807c8d13bda5449efa71f65d3e v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 64f60845e0a5..680d7d951c35 100644
--- 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
index d348b9035955..4748b906aff2 100644
--- 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);
 }