---

yaml --- r: 338881 b: refs/heads/master c: 20550a4 h: refs/heads/master i: 338879: e7b0dad v: v3
git-mirror · Oct 24, 2012 · cfafc34 · cfafc34
1 parent 8da7c89
commit cfafc34
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     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
@@ Expand Down @@