From: Robert Richter <robert.richter@amd.com>
Date: Fri, 11 May 2012 09:44:59 +0000 (+0200)
Subject: perf/x86/ibs: Fix undefined reference to `get_ibs_caps'
X-Git-Tag: v3.5-rc1~120^3~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=978da300c7a65494692b329a6a4cbf364afc37c5;p=profile%2Fcommon%2Fkernel-common.git

perf/x86/ibs: Fix undefined reference to `get_ibs_caps'

Fixing i386 allnoconfig built errors:

 arch/x86/built-in.o: In function `amd_pmu_hw_config':
 perf_event_amd.c:(.text+0xc3e1): undefined reference to `get_ibs_caps'

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 4e40a64..588f52e 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/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);