aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/perf_event.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2009-12-07 17:12:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-12-08 02:58:40 +0100
commit2ff6cfd70720780234fdfea636218c2a62b31287 (patch)
treee0d4ce6cc443a6cb2c32f6e2c08c9512c1b4dbd4 /include/linux/perf_event.h
parentd3a2dbf844d81b4b9c9ad6044563c294e7a48cac (diff)
downloadkernel_samsung_tuna-2ff6cfd70720780234fdfea636218c2a62b31287.zip
kernel_samsung_tuna-2ff6cfd70720780234fdfea636218c2a62b31287.tar.gz
kernel_samsung_tuna-2ff6cfd70720780234fdfea636218c2a62b31287.tar.bz2
perf events: hw_breakpoints: Don't include asm/hw_breakpoint.h in user space
asm/hw_breakpoint.h is evidently a kernel internal file and should not be included globally, not even under an #ifdef. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: K.Prasad <prasad@linux.vnet.ibm.com> LKML-Reference: <200912071712.58650.arnd@arndb.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r--include/linux/perf_event.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 89098e3..bf33294 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -18,10 +18,6 @@
#include <linux/ioctl.h>
#include <asm/byteorder.h>
-#ifdef CONFIG_HAVE_HW_BREAKPOINT
-#include <asm/hw_breakpoint.h>
-#endif
-
/*
* User-space ABI bits:
*/
@@ -451,6 +447,10 @@ enum perf_callchain_context {
# include <asm/perf_event.h>
#endif
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+#include <asm/hw_breakpoint.h>
+#endif
+
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/rculist.h>