aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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