Messages in this thread Patch in this message | | | Date | Wed, 9 Jun 2010 10:18:39 GMT | From | tip-bot for Peter Zijlstra <> | Subject | [tip:perf/core] perf: Fix build breakage for architecutes without atomic64_t |
| |
Commit-ID: 7be7923633a142402266d642ccebf74f556a649b Gitweb: http://git.kernel.org/tip/7be7923633a142402266d642ccebf74f556a649b Author: Peter Zijlstra <a.p.zijlstra@chello.nl> AuthorDate: Wed, 9 Jun 2010 11:57:23 +0200 Committer: Ingo Molnar <mingo@elte.hu> 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.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission> --- include/linux/perf_event.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 7342979..1218d05 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
| |