---

yaml --- r: 205253 b: refs/heads/master c: 7be7923 h: refs/heads/master i: 205251: 0348383 v: v3
git-mirror · Jun 9, 2010 · be324ce · be324ce
1 parent ced6f04
commit be324ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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