---

yaml --- r: 304941 b: refs/heads/master c: 978da30 h: refs/heads/master i: 304939: d19500a v: v3
git-mirror · May 14, 2012 · f2107d4 · f2107d4
1 parent 617266c
commit f2107d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c5a0f96e82ed73bca017c1c5601a4253cff49df
+refs/heads/master: 978da300c7a65494692b329a6a4cbf364afc37c5
diff --git a/trunk/arch/x86/include/asm/perf_event.h b/trunk/arch/x86/include/asm/perf_event.h
@@ -188,7 +188,11 @@ struct x86_pmu_capability {
 #define IBS_OP_MAX_CNT_EXT	0x007FFFFFULL	/* not a register bit mask */
 #define IBS_RIP_INVALID		(1ULL<<38)
 
+#ifdef CONFIG_X86_LOCAL_APIC
 extern u32 get_ibs_caps(void);
+#else
+static inline u32 get_ibs_caps(void) { return 0; }
+#endif
 
 #ifdef CONFIG_PERF_EVENTS
 extern void perf_events_lapic_init(void);