diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-02 11:54:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-02 17:33:07 +0100 |
| commit | 140ffcec4def3ee3af7565b2cf1d3b2580f7e180 (patch) | |
| tree | 466da398c345f5b6f2760c124beec84403b35655 /mm/oom_kill.c | |
| parent | Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 (diff) | |
| download | linux-140ffcec4def3ee3af7565b2cf1d3b2580f7e180.tar.xz linux-140ffcec4def3ee3af7565b2cf1d3b2580f7e180.zip | |
[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>
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index c86c737d2433..78747afad6b0 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); } |