diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 1a631ba684a4..6ba49c7cb128 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #include <linux/reboot.h> | 50 | #include <linux/reboot.h> |
51 | #include <linux/ftrace.h> | 51 | #include <linux/ftrace.h> |
52 | #include <linux/slow-work.h> | 52 | #include <linux/slow-work.h> |
53 | #include <linux/perf_counter.h> | 53 | #include <linux/perf_event.h> |
54 | 54 | ||
55 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
56 | #include <asm/processor.h> | 56 | #include <asm/processor.h> |
@@ -964,28 +964,28 @@ static struct ctl_table kern_table[] = { | |||
964 | .child = slow_work_sysctls, | 964 | .child = slow_work_sysctls, |
965 | }, | 965 | }, |
966 | #endif | 966 | #endif |
967 | #ifdef CONFIG_PERF_COUNTERS | 967 | #ifdef CONFIG_PERF_EVENTS |
968 | { | 968 | { |
969 | .ctl_name = CTL_UNNUMBERED, | 969 | .ctl_name = CTL_UNNUMBERED, |
970 | .procname = "perf_counter_paranoid", | 970 | .procname = "perf_event_paranoid", |
971 | .data = &sysctl_perf_counter_paranoid, | 971 | .data = &sysctl_perf_event_paranoid, |
972 | .maxlen = sizeof(sysctl_perf_counter_paranoid), | 972 | .maxlen = sizeof(sysctl_perf_event_paranoid), |
973 | .mode = 0644, | 973 | .mode = 0644, |
974 | .proc_handler = &proc_dointvec, | 974 | .proc_handler = &proc_dointvec, |
975 | }, | 975 | }, |
976 | { | 976 | { |
977 | .ctl_name = CTL_UNNUMBERED, | 977 | .ctl_name = CTL_UNNUMBERED, |
978 | .procname = "perf_counter_mlock_kb", | 978 | .procname = "perf_event_mlock_kb", |
979 | .data = &sysctl_perf_counter_mlock, | 979 | .data = &sysctl_perf_event_mlock, |
980 | .maxlen = sizeof(sysctl_perf_counter_mlock), | 980 | .maxlen = sizeof(sysctl_perf_event_mlock), |
981 | .mode = 0644, | 981 | .mode = 0644, |
982 | .proc_handler = &proc_dointvec, | 982 | .proc_handler = &proc_dointvec, |
983 | }, | 983 | }, |
984 | { | 984 | { |
985 | .ctl_name = CTL_UNNUMBERED, | 985 | .ctl_name = CTL_UNNUMBERED, |
986 | .procname = "perf_counter_max_sample_rate", | 986 | .procname = "perf_event_max_sample_rate", |
987 | .data = &sysctl_perf_counter_sample_rate, | 987 | .data = &sysctl_perf_event_sample_rate, |
988 | .maxlen = sizeof(sysctl_perf_counter_sample_rate), | 988 | .maxlen = sizeof(sysctl_perf_event_sample_rate), |
989 | .mode = 0644, | 989 | .mode = 0644, |
990 | .proc_handler = &proc_dointvec, | 990 | .proc_handler = &proc_dointvec, |
991 | }, | 991 | }, |