diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-04 04:22:45 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-04 04:22:45 +0100 |
| commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
| tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /mm/oom_kill.c | |
| parent | [PATCH] sb1250-mac: Add support for the BCM1480 (diff) | |
| parent | Massive net driver const-ification. (diff) | |
| download | linux-46153552b43675dd4057cd526331b5bd10f39c7d.tar.xz linux-46153552b43675dd4057cd526331b5bd10f39c7d.zip | |
Merge branch 'net-const'
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); } |