diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-22 12:28:19 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-22 12:28:19 -0400 |
| commit | 7efb35af738e96565934cc640d863eb18dba0206 (patch) | |
| tree | 29ed331d864b0cfa73fdca5fd3982896e56f9530 /mm/oom_kill.c | |
| parent | 748c5151deb56e4b7b5a9b07a884243764933831 (diff) | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 824cade07827..91a081a82f55 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -496,7 +496,7 @@ retry: | |||
| 496 | panic("Out of memory and no killable processes...\n"); | 496 | panic("Out of memory and no killable processes...\n"); |
| 497 | } | 497 | } |
| 498 | 498 | ||
| 499 | if (oom_kill_process(p, points, gfp_mask, order, | 499 | if (oom_kill_process(p, gfp_mask, order, points, |
| 500 | "Out of memory")) | 500 | "Out of memory")) |
| 501 | goto retry; | 501 | goto retry; |
| 502 | 502 | ||