aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-06-09 11:57:23 +0200
committerIngo Molnar <mingo@elte.hu>2010-06-09 12:03:00 +0200
commit7be7923633a142402266d642ccebf74f556a649b (patch)
tree9ff99f26d8f30110318f9269c0205559c96e0953
parentperf: Convert perf_event to local_t (diff)
downloadlinux-dev-7be7923633a142402266d642ccebf74f556a649b.tar.xz
linux-dev-7be7923633a142402266d642ccebf74f556a649b.zip
perf: Fix build breakage for architecutes without atomic64_t
The local64.h include dependency was not dependent on PERF_EVENT=y, which meant that arch's without atomic64_t support ended up including it and failed to build. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission>
-rw-r--r--include/linux/perf_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 7342979f95f2..1218d05728b9 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -462,6 +462,7 @@ enum perf_callchain_context {
#ifdef CONFIG_PERF_EVENTS
# include <asm/perf_event.h>
+# include <asm/local64.h>
#endif
struct perf_guest_info_callbacks {
@@ -487,7 +488,6 @@ struct perf_guest_info_callbacks {
#include <linux/cpu.h>
#include <asm/atomic.h>
#include <asm/local.h>
-#include <asm/local64.h>
#define PERF_MAX_STACK_DEPTH 255