[tip:perf/urgent] perf events: hw_breakpoints: Don't include asm/hw_breakpoint.h in user space

From: tip-bot for Arnd Bergmann
Date: Tue Dec 08 2009 - 06:32:19 EST


Commit-ID: 2ff6cfd70720780234fdfea636218c2a62b31287
Gitweb: http://git.kernel.org/tip/2ff6cfd70720780234fdfea636218c2a62b31287
Author: Arnd Bergmann <arnd@xxxxxxxx>
AuthorDate: Mon, 7 Dec 2009 17:12:58 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 8 Dec 2009 02:58:40 +0100

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@xxxxxxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: K.Prasad <prasad@xxxxxxxxxxxxxxxxxx>
LKML-Reference: <200912071712.58650.arnd@xxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/linux/perf_event.h | 8 ++++----
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>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/