aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9edcf456e0fc..4ce13c3cedb9 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -120,7 +120,6 @@ extern int blk_iopoll_enabled;
120/* Constants used for minimum and maximum */ 120/* Constants used for minimum and maximum */
121#ifdef CONFIG_LOCKUP_DETECTOR 121#ifdef CONFIG_LOCKUP_DETECTOR
122static int sixty = 60; 122static int sixty = 60;
123static int neg_one = -1;
124#endif 123#endif
125 124
126static int zero; 125static int zero;
@@ -814,7 +813,7 @@ static struct ctl_table kern_table[] = {
814 .maxlen = sizeof(int), 813 .maxlen = sizeof(int),
815 .mode = 0644, 814 .mode = 0644,
816 .proc_handler = proc_dowatchdog, 815 .proc_handler = proc_dowatchdog,
817 .extra1 = &neg_one, 816 .extra1 = &zero,
818 .extra2 = &sixty, 817 .extra2 = &sixty,
819 }, 818 },
820 { 819 {
@@ -1044,6 +1043,15 @@ static struct ctl_table kern_table[] = {
1044 .mode = 0644, 1043 .mode = 0644,
1045 .proc_handler = perf_proc_update_handler, 1044 .proc_handler = perf_proc_update_handler,
1046 }, 1045 },
1046 {
1047 .procname = "perf_cpu_time_max_percent",
1048 .data = &sysctl_perf_cpu_time_max_percent,
1049 .maxlen = sizeof(sysctl_perf_cpu_time_max_percent),
1050 .mode = 0644,
1051 .proc_handler = perf_cpu_time_max_percent_handler,
1052 .extra1 = &zero,
1053 .extra2 = &one_hundred,
1054 },
1047#endif 1055#endif
1048#ifdef CONFIG_KMEMCHECK 1056#ifdef CONFIG_KMEMCHECK
1049 { 1057 {