From f2107d4b00ac2cf25fcc9a744e5c32612d64fd23 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Fri, 11 May 2012 11:44:59 +0200
Subject: [PATCH] --- yaml --- r: 304941 b: refs/heads/master c:
 978da300c7a65494692b329a6a4cbf364afc37c5 h: refs/heads/master i:   304939:
 d19500a57288b15251de5cb99485a49f93b9266c v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/include/asm/perf_event.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cfc7c805a3dc..31e7f36aadfa 100644
--- 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
index 4e40a64315c9..588f52ea810e 100644
--- 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);