diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 4286b62b34a0..ea78fa101ad6 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -103,6 +103,9 @@ static unsigned long one_ul = 1; | |||
103 | static int one_hundred = 100; | 103 | static int one_hundred = 100; |
104 | static int one_thousand = 1000; | 104 | static int one_thousand = 1000; |
105 | 105 | ||
106 | /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ | ||
107 | static unsigned long dirty_bytes_min = 2 * PAGE_SIZE; | ||
108 | |||
106 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ | 109 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ |
107 | static int maxolduid = 65535; | 110 | static int maxolduid = 65535; |
108 | static int minolduid; | 111 | static int minolduid; |
@@ -902,16 +905,6 @@ static struct ctl_table kern_table[] = { | |||
902 | .proc_handler = &proc_dointvec, | 905 | .proc_handler = &proc_dointvec, |
903 | }, | 906 | }, |
904 | #endif | 907 | #endif |
905 | #ifdef CONFIG_UNEVICTABLE_LRU | ||
906 | { | ||
907 | .ctl_name = CTL_UNNUMBERED, | ||
908 | .procname = "scan_unevictable_pages", | ||
909 | .data = &scan_unevictable_pages, | ||
910 | .maxlen = sizeof(scan_unevictable_pages), | ||
911 | .mode = 0644, | ||
912 | .proc_handler = &scan_unevictable_handler, | ||
913 | }, | ||
914 | #endif | ||
915 | #ifdef CONFIG_SLOW_WORK | 908 | #ifdef CONFIG_SLOW_WORK |
916 | { | 909 | { |
917 | .ctl_name = CTL_UNNUMBERED, | 910 | .ctl_name = CTL_UNNUMBERED, |
@@ -1016,7 +1009,7 @@ static struct ctl_table vm_table[] = { | |||
1016 | .mode = 0644, | 1009 | .mode = 0644, |
1017 | .proc_handler = &dirty_bytes_handler, | 1010 | .proc_handler = &dirty_bytes_handler, |
1018 | .strategy = &sysctl_intvec, | 1011 | .strategy = &sysctl_intvec, |
1019 | .extra1 = &one_ul, | 1012 | .extra1 = &dirty_bytes_min, |
1020 | }, | 1013 | }, |
1021 | { | 1014 | { |
1022 | .procname = "dirty_writeback_centisecs", | 1015 | .procname = "dirty_writeback_centisecs", |
@@ -1302,6 +1295,16 @@ static struct ctl_table vm_table[] = { | |||
1302 | .extra2 = &one, | 1295 | .extra2 = &one, |
1303 | }, | 1296 | }, |
1304 | #endif | 1297 | #endif |
1298 | #ifdef CONFIG_UNEVICTABLE_LRU | ||
1299 | { | ||
1300 | .ctl_name = CTL_UNNUMBERED, | ||
1301 | .procname = "scan_unevictable_pages", | ||
1302 | .data = &scan_unevictable_pages, | ||
1303 | .maxlen = sizeof(scan_unevictable_pages), | ||
1304 | .mode = 0644, | ||
1305 | .proc_handler = &scan_unevictable_handler, | ||
1306 | }, | ||
1307 | #endif | ||
1305 | /* | 1308 | /* |
1306 | * NOTE: do not add new entries to this table unless you have read | 1309 | * NOTE: do not add new entries to this table unless you have read |
1307 | * Documentation/sysctl/ctl_unnumbered.txt | 1310 | * Documentation/sysctl/ctl_unnumbered.txt |