diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6d850bf0a517..ca38e8e3e907 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/times.h> | 44 | #include <linux/times.h> |
45 | #include <linux/limits.h> | 45 | #include <linux/limits.h> |
46 | #include <linux/dcache.h> | 46 | #include <linux/dcache.h> |
47 | #include <linux/dnotify.h> | ||
47 | #include <linux/syscalls.h> | 48 | #include <linux/syscalls.h> |
48 | #include <linux/vmstat.h> | 49 | #include <linux/vmstat.h> |
49 | #include <linux/nfs_fs.h> | 50 | #include <linux/nfs_fs.h> |
@@ -53,6 +54,7 @@ | |||
53 | #include <linux/perf_event.h> | 54 | #include <linux/perf_event.h> |
54 | #include <linux/kprobes.h> | 55 | #include <linux/kprobes.h> |
55 | #include <linux/pipe_fs_i.h> | 56 | #include <linux/pipe_fs_i.h> |
57 | #include <linux/oom.h> | ||
56 | 58 | ||
57 | #include <asm/uaccess.h> | 59 | #include <asm/uaccess.h> |
58 | #include <asm/processor.h> | 60 | #include <asm/processor.h> |
@@ -85,9 +87,6 @@ | |||
85 | /* External variables not in a header file. */ | 87 | /* External variables not in a header file. */ |
86 | extern int sysctl_overcommit_memory; | 88 | extern int sysctl_overcommit_memory; |
87 | extern int sysctl_overcommit_ratio; | 89 | 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; | 90 | extern int max_threads; |
92 | extern int core_uses_pid; | 91 | extern int core_uses_pid; |
93 | extern int suid_dumpable; | 92 | extern int suid_dumpable; |
@@ -133,6 +132,9 @@ static int min_percpu_pagelist_fract = 8; | |||
133 | 132 | ||
134 | static int ngroups_max = NGROUPS_MAX; | 133 | static int ngroups_max = NGROUPS_MAX; |
135 | 134 | ||
135 | #ifdef CONFIG_INOTIFY_USER | ||
136 | #include <linux/inotify.h> | ||
137 | #endif | ||
136 | #ifdef CONFIG_SPARC | 138 | #ifdef CONFIG_SPARC |
137 | #include <asm/system.h> | 139 | #include <asm/system.h> |
138 | #endif | 140 | #endif |
@@ -209,9 +211,6 @@ static struct ctl_table fs_table[]; | |||
209 | static struct ctl_table debug_table[]; | 211 | static struct ctl_table debug_table[]; |
210 | static struct ctl_table dev_table[]; | 212 | static struct ctl_table dev_table[]; |
211 | extern struct ctl_table random_table[]; | 213 | extern struct ctl_table random_table[]; |
212 | #ifdef CONFIG_INOTIFY_USER | ||
213 | extern struct ctl_table inotify_table[]; | ||
214 | #endif | ||
215 | #ifdef CONFIG_EPOLL | 214 | #ifdef CONFIG_EPOLL |
216 | extern struct ctl_table epoll_table[]; | 215 | extern struct ctl_table epoll_table[]; |
217 | #endif | 216 | #endif |