diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2e490a389dd2..5ec4543dfc06 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -95,12 +95,9 @@ static int sixty = 60; | |||
95 | static int neg_one = -1; | 95 | static int neg_one = -1; |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | #if defined(CONFIG_MMU) && defined(CONFIG_FILE_LOCKING) | ||
99 | static int two = 2; | ||
100 | #endif | ||
101 | |||
102 | static int zero; | 98 | static int zero; |
103 | static int one = 1; | 99 | static int one = 1; |
100 | static int two = 2; | ||
104 | static unsigned long one_ul = 1; | 101 | static unsigned long one_ul = 1; |
105 | static int one_hundred = 100; | 102 | static int one_hundred = 100; |
106 | 103 | ||
@@ -1373,10 +1370,7 @@ static struct ctl_table fs_table[] = { | |||
1373 | .data = &lease_break_time, | 1370 | .data = &lease_break_time, |
1374 | .maxlen = sizeof(int), | 1371 | .maxlen = sizeof(int), |
1375 | .mode = 0644, | 1372 | .mode = 0644, |
1376 | .proc_handler = &proc_dointvec_minmax, | 1373 | .proc_handler = &proc_dointvec, |
1377 | .strategy = &sysctl_intvec, | ||
1378 | .extra1 = &zero, | ||
1379 | .extra2 = &two, | ||
1380 | }, | 1374 | }, |
1381 | #endif | 1375 | #endif |
1382 | #ifdef CONFIG_AIO | 1376 | #ifdef CONFIG_AIO |
@@ -1417,7 +1411,10 @@ static struct ctl_table fs_table[] = { | |||
1417 | .data = &suid_dumpable, | 1411 | .data = &suid_dumpable, |
1418 | .maxlen = sizeof(int), | 1412 | .maxlen = sizeof(int), |
1419 | .mode = 0644, | 1413 | .mode = 0644, |
1420 | .proc_handler = &proc_dointvec, | 1414 | .proc_handler = &proc_dointvec_minmax, |
1415 | .strategy = &sysctl_intvec, | ||
1416 | .extra1 = &zero, | ||
1417 | .extra2 = &two, | ||
1421 | }, | 1418 | }, |
1422 | #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) | 1419 | #if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) |
1423 | { | 1420 | { |