Skip to contentSkip to conversation

perf: Fix build breakage for architecutes without atomic64_t

tip:perf/core tip-bot for Peter Zijlstra 1 participant 1 message Jun 9, 2010 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  7be7923633a142402266d642ccebf74f556a649b
Gitweb:     http://git.kernel.org/tip/7be7923633a142402266d642ccebf74f556a649b
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Wed, 9 Jun 2010 11:57:23 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 9 Jun 2010 12:03:00 +0200

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.

LKML-Reference: <new-submission>

---
 include/linux/perf_event.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/perf_event.h +1 -1
index 7342979..1218d05 100644
@@ -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