From cfafc3489732656bfae991b0dd03e4fe786fe10d Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Wed, 10 Oct 2012 14:53:15 +0200 Subject: [PATCH] --- yaml --- r: 338881 b: refs/heads/master c: 20550a434583c78f8ff9a2819639e2bacbe58574 h: refs/heads/master i: 338879: e7b0dad5eae38393d3ee6abe27f063f785d0151f v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event.h | 1 + trunk/arch/x86/kernel/cpu/perf_event_p6.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d084ebf16fdc..92796f688c42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bf79d44133de42af01a70a1700b8bb4b6d3fb92 +refs/heads/master: 20550a434583c78f8ff9a2819639e2bacbe58574 diff --git a/trunk/arch/x86/kernel/cpu/perf_event.h b/trunk/arch/x86/kernel/cpu/perf_event.h index 21419b9178b4..115c1ea97746 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event.h +++ b/trunk/arch/x86/kernel/cpu/perf_event.h @@ -539,6 +539,7 @@ static inline void set_linear_ip(struct pt_regs *regs, unsigned long ip) } ssize_t x86_event_sysfs_show(char *page, u64 config, u64 event); +ssize_t intel_event_sysfs_show(char *page, u64 config); #ifdef CONFIG_CPU_SUP_AMD diff --git a/trunk/arch/x86/kernel/cpu/perf_event_p6.c b/trunk/arch/x86/kernel/cpu/perf_event_p6.c index e4dd0f7a0453..900b76b5d6ef 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event_p6.c +++ b/trunk/arch/x86/kernel/cpu/perf_event_p6.c @@ -134,6 +134,8 @@ static __initconst const struct x86_pmu p6_pmu = { .event_constraints = p6_event_constraints, .format_attrs = intel_p6_formats_attr, + .events_sysfs_show = intel_event_sysfs_show, + }; __init int p6_pmu_init(void)