From 564d3bde23da4db082cc53dc5b996ff250175a2b Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 9 Aug 2010 17:18:56 -0700
Subject: [PATCH] --- yaml --- r: 207217 b: refs/heads/master c:
 8e4228e1edb922afa83366803a1e5b3fa8e987c2 h: refs/heads/master i:   207215:
 f2a7a3f99bb7b34e15307d69bfe2b720823c8132 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/oom.h | 5 +++++
 trunk/kernel/sysctl.c     | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 39641363d14a..98ea630f66d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e365893236ca78fa1fe2482ccbdc30e9abde6027
+refs/heads/master: 8e4228e1edb922afa83366803a1e5b3fa8e987c2
diff --git a/trunk/include/linux/oom.h b/trunk/include/linux/oom.h
index 3ae6d94d0540..1a8e407a1a53 100644
--- a/trunk/include/linux/oom.h
+++ b/trunk/include/linux/oom.h
@@ -44,5 +44,10 @@ static inline void oom_killer_enable(void)
 {
 	oom_killer_disabled = false;
 }
+
+/* sysctls */
+extern int sysctl_oom_dump_tasks;
+extern int sysctl_oom_kill_allocating_task;
+extern int sysctl_panic_on_oom;
 #endif /* __KERNEL__*/
 #endif /* _INCLUDE_LINUX_OOM_H */
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 6d850bf0a517..6b005e4912b5 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -53,6 +53,7 @@
 #include <linux/perf_event.h>
 #include <linux/kprobes.h>
 #include <linux/pipe_fs_i.h>
+#include <linux/oom.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
@@ -85,9 +86,6 @@
 /* External variables not in a header file. */
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;
-extern int sysctl_panic_on_oom;
-extern int sysctl_oom_kill_allocating_task;
-extern int sysctl_oom_dump_tasks;
 extern int max_threads;
 extern int core_uses_pid;
 extern int suid_dumpable;