---

yaml --- r: 207213 b: refs/heads/master c: ad915c4 h: refs/heads/master i: 207211: f210410 v: v3
git-mirror · Aug 10, 2010 · c87b2ec · c87b2ec
1 parent 8c807dc
commit c87b2ec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f48d0ebd907ae419387f27b602ee98870cfa7bb
+refs/heads/master: ad915c432eccb482427c1bbd77c74e6f7bfe60b3
diff --git a/trunk/Documentation/sysctl/vm.txt b/trunk/Documentation/sysctl/vm.txt
@@ -511,7 +511,7 @@ information may not be desired.
 If this is set to non-zero, this information is shown whenever the
 OOM killer actually kills a memory-hogging task.
 
-The default value is 0.
+The default value is 1 (enabled).
 
 ==============================================================
 

diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -32,7 +32,7 @@
 
 int sysctl_panic_on_oom;
 int sysctl_oom_kill_allocating_task;
-int sysctl_oom_dump_tasks;
+int sysctl_oom_dump_tasks = 1;
 static DEFINE_SPINLOCK(zone_scan_lock);
 /* #define DEBUG */