aboutsummaryrefslogtreecommitdiffstats
path: root/mm/oom_kill.c
diff options
context:
space:
mode:
authorYasunori Goto <y-goto@jp.fujitsu.com>2007-05-06 17:49:59 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:55 -0400
commit2b744c01a54fe0c9974ff1b29522f25f07084053 (patch)
tree6f9c7399703ad34ab35f01a55c77a1d34a5c6dc1 /mm/oom_kill.c
parent824ebef122153a03925ae0ed211b4e8568d1c8db (diff)
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.c3
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)
413 show_mem(); 413 show_mem();
414 } 414 }
415 415
416 if (sysctl_panic_on_oom == 2)
417 panic("out of memory. Compulsory panic_on_oom is selected.\n");
418
416 cpuset_lock(); 419 cpuset_lock();
417 read_lock(&tasklist_lock); 420 read_lock(&tasklist_lock);
418 421