Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / x86 / include / asm / hw_breakpoint.h

diff --git a/arch/x86/include/asm/hw_breakpoint.h b/arch/x86/include/asm/hw_breakpoint.h
index 824ca07860d012cdcc9c46886500d056fdb2aeed..ef1c4d2d41eceff8cee01b4fdc9c18987c2dbe20 100644 (file)
--- a/arch/x86/include/asm/hw_breakpoint.h
+++ b/arch/x86/include/asm/hw_breakpoint.h
@@ -1,7 +1,8 @@
 #ifndef        _I386_HW_BREAKPOINT_H
 #define        _I386_HW_BREAKPOINT_H
 
-#ifdef __KERNEL__
+#include <uapi/asm/hw_breakpoint.h>
+
 #define        __ARCH_HW_BREAKPOINT_H
 
 /*
@@ -71,6 +72,4 @@ extern int arch_bp_generic_fields(int x86_len, int x86_type,
 
 extern struct pmu perf_ops_bp;
 
-#endif /* __KERNEL__ */
 #endif /* _I386_HW_BREAKPOINT_H */
-