From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 25 Dec 2008 08:02:11 +0000 (+0100)
Subject: perfcounters: include asm/perf_counter.h only if CONFIG_PERF_COUNTERS=y
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e44aef58ecfbe061eb4c53b939bcc35fb1bee82d;p=deliverable%2Flinux.git

perfcounters: include asm/perf_counter.h only if CONFIG_PERF_COUNTERS=y

Impact: build fix on ia64

KOSAKI Motohiro reported that -tip doesnt build on ia64 because
asm/perf_counter.h only exists on x86 for now. Fix it.

Reported-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index ec77d1643d37..cc3a75a239a9 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -14,7 +14,10 @@
 #define _LINUX_PERF_COUNTER_H
 
 #include <asm/atomic.h>
-#include <asm/perf_counter.h>
+
+#ifdef CONFIG_PERF_COUNTERS
+# include <asm/perf_counter.h>
+#endif
 
 #include <linux/list.h>
 #include <linux/mutex.h>