]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
perf: Fix build breakage for architecutes without atomic64_t
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Wed, 9 Jun 2010 09:57:23 +0000 (11:57 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 9 Jun 2010 10:03:00 +0000 (12:03 +0200)
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>

include/linux/perf_event.h

index 7342979f95f220f535f1d268341f6d202de8b5de..1218d05728b9135c87a12370d2d5fa6f8326cc70 100644 (file)
@@ -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