From c87b2ecf5ddc03f5f024b1ac0878fdd4f39e99a3 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Mon, 9 Aug 2010 17:18:53 -0700 Subject: [PATCH] --- yaml --- r: 207213 b: refs/heads/master c: ad915c432eccb482427c1bbd77c74e6f7bfe60b3 h: refs/heads/master i: 207211: f21041095875590ac1596f2ae9017d76e4974cc5 v: v3 --- [refs] | 2 +- trunk/Documentation/sysctl/vm.txt | 2 +- trunk/mm/oom_kill.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d2c6360b283d..e2b203a94e24 100644 --- 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 index 82b2da18c45d..b606c2c4dd37 100644 --- 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 index 13ceed78bc45..01b5e01e52cb 100644 --- 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 */