diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 03:02:11 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 04:57:48 -0500 |
| commit | e44aef58ecfbe061eb4c53b939bcc35fb1bee82d (patch) | |
| tree | 6357bafacfa15375ca2f2655dcf63cc7d54ec356 | |
| parent | 2f18d1e8d07ae67dd0afce875287756d4bd31a46 (diff) | |
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>
| -rw-r--r-- | include/linux/perf_counter.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ | |||
| 14 | #define _LINUX_PERF_COUNTER_H | 14 | #define _LINUX_PERF_COUNTER_H |
| 15 | 15 | ||
| 16 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
| 17 | #include <asm/perf_counter.h> | 17 | |
| 18 | #ifdef CONFIG_PERF_COUNTERS | ||
| 19 | # include <asm/perf_counter.h> | ||
| 20 | #endif | ||
| 18 | 21 | ||
| 19 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 20 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |