From be324cec51ba3fdaeda82ca3975cc91c680c7066 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 9 Jun 2010 11:57:23 +0200
Subject: [PATCH] --- yaml --- r: 205253 b: refs/heads/master c:
 7be7923633a142402266d642ccebf74f556a649b h: refs/heads/master i:   205251:
 03483837dac4052fb0c4196e2ced48bc3b08a1aa v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/perf_event.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71087323f9f3..84881443e73b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e78505958cf123048fb48cb56b79cebb8edd15fb
+refs/heads/master: 7be7923633a142402266d642ccebf74f556a649b
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
index 7342979f95f2..1218d05728b9 100644
--- a/trunk/include/linux/perf_event.h
+++ b/trunk/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