diff options
| author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2007-05-06 14:49:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:12:55 -0700 |
| commit | 2b744c01a54fe0c9974ff1b29522f25f07084053 (patch) | |
| tree | 6f9c7399703ad34ab35f01a55c77a1d34a5c6dc1 /mm/oom_kill.c | |
| parent | 824ebef122153a03925ae0ed211b4e8568d1c8db (diff) | |
| download | blackbird-op-linux-2b744c01a54fe0c9974ff1b29522f25f07084053.tar.gz blackbird-op-linux-2b744c01a54fe0c9974ff1b29522f25f07084053.zip | |
mm: fix handling of panic_on_oom when cpusets are in use
The current panic_on_oom may not work if there is a process using
cpusets/mempolicy, because other nodes' memory may remain. But some people
want failover by panic ASAP even if they are used. This patch makes new
setting for its request.
This is tested on my ia64 box which has 3 nodes.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Paul Jackson <pj@sgi.com>
Cc: Ethan Solomita <solo@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index a35e7a8ebd7e..038d2234f139 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -413,6 +413,9 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) show_mem(); } + if (sysctl_panic_on_oom == 2) + panic("out of memory. Compulsory panic_on_oom is selected.\n"); + cpuset_lock(); read_lock(&tasklist_lock); |
