diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /mm/oom_kill.c | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'mm/oom_kill.c')
| -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: | |||
| 298 | 298 | ||
| 299 | /* | 299 | /* |
| 300 | * Give "p" a good chance of killing itself before we | 300 | * Give "p" a good chance of killing itself before we |
| 301 | * retry to allocate memory. | 301 | * retry to allocate memory unless "p" is current |
| 302 | */ | 302 | */ |
| 303 | schedule_timeout_interruptible(1); | 303 | if (!test_thread_flag(TIF_MEMDIE)) |
| 304 | schedule_timeout_interruptible(1); | ||
| 304 | } | 305 | } |