diff options
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0e51a35a4486..62e4ff9968b5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/security.h> | 27 | #include <linux/security.h> |
| 28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
| 29 | #include <linux/utsname.h> | 29 | #include <linux/utsname.h> |
| 30 | #include <linux/kmemcheck.h> | ||
| 30 | #include <linux/smp_lock.h> | 31 | #include <linux/smp_lock.h> |
| 31 | #include <linux/fs.h> | 32 | #include <linux/fs.h> |
| 32 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| @@ -967,6 +968,17 @@ static struct ctl_table kern_table[] = { | |||
| 967 | .proc_handler = &proc_dointvec, | 968 | .proc_handler = &proc_dointvec, |
| 968 | }, | 969 | }, |
| 969 | #endif | 970 | #endif |
| 971 | #ifdef CONFIG_KMEMCHECK | ||
| 972 | { | ||
| 973 | .ctl_name = CTL_UNNUMBERED, | ||
| 974 | .procname = "kmemcheck", | ||
| 975 | .data = &kmemcheck_enabled, | ||
| 976 | .maxlen = sizeof(int), | ||
| 977 | .mode = 0644, | ||
| 978 | .proc_handler = &proc_dointvec, | ||
| 979 | }, | ||
| 980 | #endif | ||
| 981 | |||
| 970 | /* | 982 | /* |
| 971 | * NOTE: do not add new entries to this table unless you have read | 983 | * NOTE: do not add new entries to this table unless you have read |
| 972 | * Documentation/sysctl/ctl_unnumbered.txt | 984 | * Documentation/sysctl/ctl_unnumbered.txt |
| @@ -1325,7 +1337,6 @@ static struct ctl_table vm_table[] = { | |||
| 1325 | .extra2 = &one, | 1337 | .extra2 = &one, |
| 1326 | }, | 1338 | }, |
| 1327 | #endif | 1339 | #endif |
| 1328 | #ifdef CONFIG_UNEVICTABLE_LRU | ||
| 1329 | { | 1340 | { |
| 1330 | .ctl_name = CTL_UNNUMBERED, | 1341 | .ctl_name = CTL_UNNUMBERED, |
| 1331 | .procname = "scan_unevictable_pages", | 1342 | .procname = "scan_unevictable_pages", |
| @@ -1334,7 +1345,6 @@ static struct ctl_table vm_table[] = { | |||
| 1334 | .mode = 0644, | 1345 | .mode = 0644, |
| 1335 | .proc_handler = &scan_unevictable_handler, | 1346 | .proc_handler = &scan_unevictable_handler, |
| 1336 | }, | 1347 | }, |
| 1337 | #endif | ||
| 1338 | /* | 1348 | /* |
| 1339 | * NOTE: do not add new entries to this table unless you have read | 1349 | * NOTE: do not add new entries to this table unless you have read |
| 1340 | * Documentation/sysctl/ctl_unnumbered.txt | 1350 | * Documentation/sysctl/ctl_unnumbered.txt |
| @@ -2273,7 +2283,7 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, | |||
| 2273 | void *data) | 2283 | void *data) |
| 2274 | { | 2284 | { |
| 2275 | #define TMPBUFLEN 21 | 2285 | #define TMPBUFLEN 21 |
| 2276 | int *i, vleft, first=1, neg, val; | 2286 | int *i, vleft, first = 1, neg; |
| 2277 | unsigned long lval; | 2287 | unsigned long lval; |
| 2278 | size_t left, len; | 2288 | size_t left, len; |
| 2279 | 2289 | ||
| @@ -2326,8 +2336,6 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, | |||
| 2326 | len = p-buf; | 2336 | len = p-buf; |
| 2327 | if ((len < left) && *p && !isspace(*p)) | 2337 | if ((len < left) && *p && !isspace(*p)) |
| 2328 | break; | 2338 | break; |
| 2329 | if (neg) | ||
| 2330 | val = -val; | ||
| 2331 | s += len; | 2339 | s += len; |
| 2332 | left -= len; | 2340 | left -= len; |
| 2333 | 2341 | ||
