diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-06-09 05:57:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 06:03:00 -0400 |
commit | 7be7923633a142402266d642ccebf74f556a649b (patch) | |
tree | 9ff99f26d8f30110318f9269c0205559c96e0953 | |
parent | e78505958cf123048fb48cb56b79cebb8edd15fb (diff) |
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.h | 2 |
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 { | |||
462 | 462 | ||
463 | #ifdef CONFIG_PERF_EVENTS | 463 | #ifdef CONFIG_PERF_EVENTS |
464 | # include <asm/perf_event.h> | 464 | # include <asm/perf_event.h> |
465 | # include <asm/local64.h> | ||
465 | #endif | 466 | #endif |
466 | 467 | ||
467 | struct perf_guest_info_callbacks { | 468 | struct perf_guest_info_callbacks { |
@@ -487,7 +488,6 @@ struct perf_guest_info_callbacks { | |||
487 | #include <linux/cpu.h> | 488 | #include <linux/cpu.h> |
488 | #include <asm/atomic.h> | 489 | #include <asm/atomic.h> |
489 | #include <asm/local.h> | 490 | #include <asm/local.h> |
490 | #include <asm/local64.h> | ||
491 | 491 | ||
492 | #define PERF_MAX_STACK_DEPTH 255 | 492 | #define PERF_MAX_STACK_DEPTH 255 |
493 | 493 | ||