From: Andrew Morton <akpm@osdl.org>
Date: Thu, 2 Mar 2006 10:54:28 +0000 (-0800)
Subject: [PATCH] out_of_memory() locking fix
X-Git-Tag: v2.6.16-rc6~133
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=140ffcec4def3ee3af7565b2cf1d3b2580f7e180;p=linux-2.6-omap-h63xx.git

[PATCH] out_of_memory() locking fix

I seem to have lost this read_unlock().

While we're there, let's turn that interruptible sleep unto uninterruptible,
so we don't get a busywait if signal_pending().  (Again.  We seem to have a
habit of doing this).

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index c86c737d243..78747afad6b 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -355,6 +355,7 @@ retry:
 	}
 
 out:
+	read_unlock(&tasklist_lock);
 	cpuset_unlock();
 	if (mm)
 		mmput(mm);
@@ -364,5 +365,5 @@ out:
 	 * retry to allocate memory unless "p" is current
 	 */
 	if (!test_thread_flag(TIF_MEMDIE))
-		schedule_timeout_interruptible(1);
+		schedule_timeout_uninterruptible(1);
 }