diff options
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c904748f2290..4073353abd4f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -76,6 +76,8 @@ extern int pid_max_min, pid_max_max; | |||
| 76 | extern int sysctl_drop_caches; | 76 | extern int sysctl_drop_caches; |
| 77 | extern int percpu_pagelist_fraction; | 77 | extern int percpu_pagelist_fraction; |
| 78 | extern int compat_log; | 78 | extern int compat_log; |
| 79 | extern int maps_protect; | ||
| 80 | extern int sysctl_stat_interval; | ||
| 79 | 81 | ||
| 80 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ | 82 | /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ |
| 81 | static int maxolduid = 65535; | 83 | static int maxolduid = 65535; |
| @@ -603,6 +605,16 @@ static ctl_table kern_table[] = { | |||
| 603 | .proc_handler = &proc_dointvec, | 605 | .proc_handler = &proc_dointvec, |
| 604 | }, | 606 | }, |
| 605 | #endif | 607 | #endif |
| 608 | #ifdef CONFIG_PROC_FS | ||
| 609 | { | ||
| 610 | .ctl_name = CTL_UNNUMBERED, | ||
| 611 | .procname = "maps_protect", | ||
| 612 | .data = &maps_protect, | ||
| 613 | .maxlen = sizeof(int), | ||
| 614 | .mode = 0644, | ||
| 615 | .proc_handler = &proc_dointvec, | ||
| 616 | }, | ||
| 617 | #endif | ||
| 606 | 618 | ||
| 607 | { .ctl_name = 0 } | 619 | { .ctl_name = 0 } |
| 608 | }; | 620 | }; |
| @@ -846,6 +858,17 @@ static ctl_table vm_table[] = { | |||
| 846 | .extra2 = &one_hundred, | 858 | .extra2 = &one_hundred, |
| 847 | }, | 859 | }, |
| 848 | #endif | 860 | #endif |
| 861 | #ifdef CONFIG_SMP | ||
| 862 | { | ||
| 863 | .ctl_name = CTL_UNNUMBERED, | ||
| 864 | .procname = "stat_interval", | ||
| 865 | .data = &sysctl_stat_interval, | ||
| 866 | .maxlen = sizeof(sysctl_stat_interval), | ||
| 867 | .mode = 0644, | ||
| 868 | .proc_handler = &proc_dointvec_jiffies, | ||
| 869 | .strategy = &sysctl_jiffies, | ||
| 870 | }, | ||
| 871 | #endif | ||
| 849 | #if defined(CONFIG_X86_32) || \ | 872 | #if defined(CONFIG_X86_32) || \ |
| 850 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) | 873 | (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) |
| 851 | { | 874 | { |
