diff options
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.h | 1 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_p6.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index 21419b9178b4..115c1ea97746 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h | |||
@@ -539,6 +539,7 @@ static inline void set_linear_ip(struct pt_regs *regs, unsigned long ip) | |||
539 | } | 539 | } |
540 | 540 | ||
541 | ssize_t x86_event_sysfs_show(char *page, u64 config, u64 event); | 541 | ssize_t x86_event_sysfs_show(char *page, u64 config, u64 event); |
542 | ssize_t intel_event_sysfs_show(char *page, u64 config); | ||
542 | 543 | ||
543 | #ifdef CONFIG_CPU_SUP_AMD | 544 | #ifdef CONFIG_CPU_SUP_AMD |
544 | 545 | ||
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c index e4dd0f7a0453..900b76b5d6ef 100644 --- a/arch/x86/kernel/cpu/perf_event_p6.c +++ b/arch/x86/kernel/cpu/perf_event_p6.c | |||
@@ -134,6 +134,8 @@ static __initconst const struct x86_pmu p6_pmu = { | |||
134 | .event_constraints = p6_event_constraints, | 134 | .event_constraints = p6_event_constraints, |
135 | 135 | ||
136 | .format_attrs = intel_p6_formats_attr, | 136 | .format_attrs = intel_p6_formats_attr, |
137 | .events_sysfs_show = intel_event_sysfs_show, | ||
138 | |||
137 | }; | 139 | }; |
138 | 140 | ||
139 | __init int p6_pmu_init(void) | 141 | __init int p6_pmu_init(void) |