diff options
author | David Rientjes <rientjes@google.com> | 2010-08-09 20:18:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 23:44:57 -0400 |
commit | 8e4228e1edb922afa83366803a1e5b3fa8e987c2 (patch) | |
tree | e741de337b409a430e0f34647e059dd35a84f72c | |
parent | e365893236ca78fa1fe2482ccbdc30e9abde6027 (diff) |
oom: move sysctl declarations to oom.h
The three oom killer sysctl variables (sysctl_oom_dump_tasks,
sysctl_oom_kill_allocating_task, and sysctl_panic_on_oom) are better
declared in include/linux/oom.h rather than kernel/sysctl.c.
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-- | include/linux/oom.h | 5 | ||||
-rw-r--r-- | kernel/sysctl.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index 3ae6d94d0540..1a8e407a1a53 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h | |||
@@ -44,5 +44,10 @@ static inline void oom_killer_enable(void) | |||
44 | { | 44 | { |
45 | oom_killer_disabled = false; | 45 | oom_killer_disabled = false; |
46 | } | 46 | } |
47 | |||
48 | /* sysctls */ | ||
49 | extern int sysctl_oom_dump_tasks; | ||
50 | extern int sysctl_oom_kill_allocating_task; | ||
51 | extern int sysctl_panic_on_oom; | ||
47 | #endif /* __KERNEL__*/ | 52 | #endif /* __KERNEL__*/ |
48 | #endif /* _INCLUDE_LINUX_OOM_H */ | 53 | #endif /* _INCLUDE_LINUX_OOM_H */ |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6d850bf0a517..6b005e4912b5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #include <linux/perf_event.h> | 53 | #include <linux/perf_event.h> |
54 | #include <linux/kprobes.h> | 54 | #include <linux/kprobes.h> |
55 | #include <linux/pipe_fs_i.h> | 55 | #include <linux/pipe_fs_i.h> |
56 | #include <linux/oom.h> | ||
56 | 57 | ||
57 | #include <asm/uaccess.h> | 58 | #include <asm/uaccess.h> |
58 | #include <asm/processor.h> | 59 | #include <asm/processor.h> |
@@ -85,9 +86,6 @@ | |||
85 | /* External variables not in a header file. */ | 86 | /* External variables not in a header file. */ |
86 | extern int sysctl_overcommit_memory; | 87 | extern int sysctl_overcommit_memory; |
87 | extern int sysctl_overcommit_ratio; | 88 | extern int sysctl_overcommit_ratio; |
88 | extern int sysctl_panic_on_oom; | ||
89 | extern int sysctl_oom_kill_allocating_task; | ||
90 | extern int sysctl_oom_dump_tasks; | ||
91 | extern int max_threads; | 89 | extern int max_threads; |
92 | extern int core_uses_pid; | 90 | extern int core_uses_pid; |
93 | extern int suid_dumpable; | 91 | extern int suid_dumpable; |