diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9576bd582d4a..4a13a389e99b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/proc_fs.h> | 30 | #include <linux/proc_fs.h> |
31 | #include <linux/security.h> | 31 | #include <linux/security.h> |
32 | #include <linux/ctype.h> | 32 | #include <linux/ctype.h> |
33 | #include <linux/kmemcheck.h> | ||
34 | #include <linux/kmemleak.h> | 33 | #include <linux/kmemleak.h> |
35 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
36 | #include <linux/init.h> | 35 | #include <linux/init.h> |
@@ -1174,15 +1173,6 @@ static struct ctl_table kern_table[] = { | |||
1174 | .extra2 = &one_thousand, | 1173 | .extra2 = &one_thousand, |
1175 | }, | 1174 | }, |
1176 | #endif | 1175 | #endif |
1177 | #ifdef CONFIG_KMEMCHECK | ||
1178 | { | ||
1179 | .procname = "kmemcheck", | ||
1180 | .data = &kmemcheck_enabled, | ||
1181 | .maxlen = sizeof(int), | ||
1182 | .mode = 0644, | ||
1183 | .proc_handler = proc_dointvec, | ||
1184 | }, | ||
1185 | #endif | ||
1186 | { | 1176 | { |
1187 | .procname = "panic_on_warn", | 1177 | .procname = "panic_on_warn", |
1188 | .data = &panic_on_warn, | 1178 | .data = &panic_on_warn, |
@@ -1366,6 +1356,15 @@ static struct ctl_table vm_table[] = { | |||
1366 | .mode = 0644, | 1356 | .mode = 0644, |
1367 | .proc_handler = &hugetlb_mempolicy_sysctl_handler, | 1357 | .proc_handler = &hugetlb_mempolicy_sysctl_handler, |
1368 | }, | 1358 | }, |
1359 | { | ||
1360 | .procname = "numa_stat", | ||
1361 | .data = &sysctl_vm_numa_stat, | ||
1362 | .maxlen = sizeof(int), | ||
1363 | .mode = 0644, | ||
1364 | .proc_handler = sysctl_vm_numa_stat_handler, | ||
1365 | .extra1 = &zero, | ||
1366 | .extra2 = &one, | ||
1367 | }, | ||
1369 | #endif | 1368 | #endif |
1370 | { | 1369 | { |
1371 | .procname = "hugetlb_shm_group", | 1370 | .procname = "hugetlb_shm_group", |