diff options
| author | Kirill Korotaev <dev@sw.ru> | 2006-01-08 01:01:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:12:45 -0800 |
| commit | 2f659f462d2ab519068d0e2bb677d7a700decb8d (patch) | |
| tree | de65a0b6151880ef5d0b06efd949e32629a2dfd5 /mm | |
| parent | 6ce3c4c0ff62ca6391019b7832fb41a7f28b9e26 (diff) | |
| download | linux-2f659f462d2ab519068d0e2bb677d7a700decb8d.tar.gz linux-2f659f462d2ab519068d0e2bb677d7a700decb8d.tar.bz2 linux-2f659f462d2ab519068d0e2bb677d7a700decb8d.zip | |
[PATCH] Optimise oom kill of current task
When oom_killer kills current there's no need to call
schedule_timeout_interruptible() since task must die ASAP.
Signed-Off-By: Pavel Emelianov <xemul@sw.ru>
Signed-Off-By: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/oom_kill.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index d348b9035955..4748b906aff2 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -298,7 +298,8 @@ retry: /* * 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); } |