diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /mm/oom_kill.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 5ec8da12cfd9..ac3bf33e5370 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -300,6 +300,5 @@ retry: | |||
| 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. |
| 302 | */ | 302 | */ |
| 303 | __set_current_state(TASK_INTERRUPTIBLE); | 303 | schedule_timeout_interruptible(1); |
| 304 | schedule_timeout(1); | ||
| 305 | } | 304 | } |