aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2010-08-09 20:18:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:44:56 -0400
commitad915c432eccb482427c1bbd77c74e6f7bfe60b3 (patch)
treed93b536c48773527c8ae0312d6dcf45d57dd1b89
parent6f48d0ebd907ae419387f27b602ee98870cfa7bb (diff)
oom: enable oom tasklist dump by default
The oom killer tasklist dump, enabled with the oom_dump_tasks sysctl, is very helpful information in diagnosing why a user's task has been killed. It emits useful information such as each eligible thread's memory usage that can determine why the system is oom, so it should be enabled by default. Signed-off-by: David Rientjes <rientjes@google.com> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/sysctl/vm.txt2
-rw-r--r--mm/oom_kill.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 82b2da18c45d..b606c2c4dd37 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -511,7 +511,7 @@ information may not be desired.
511If this is set to non-zero, this information is shown whenever the 511If this is set to non-zero, this information is shown whenever the
512OOM killer actually kills a memory-hogging task. 512OOM killer actually kills a memory-hogging task.
513 513
514The default value is 0. 514The default value is 1 (enabled).
515 515
516============================================================== 516==============================================================
517 517
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 13ceed78bc45..01b5e01e52cb 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -32,7 +32,7 @@
32 32
33int sysctl_panic_on_oom; 33int sysctl_panic_on_oom;
34int sysctl_oom_kill_allocating_task; 34int sysctl_oom_kill_allocating_task;
35int sysctl_oom_dump_tasks; 35int sysctl_oom_dump_tasks = 1;
36static DEFINE_SPINLOCK(zone_scan_lock); 36static DEFINE_SPINLOCK(zone_scan_lock);
37/* #define DEBUG */ 37/* #define DEBUG */
38 38