diff options
| -rw-r--r-- | arch/x86/include/asm/hw_breakpoint.h | 2 | ||||
| -rw-r--r-- | include/linux/hw_breakpoint.h (renamed from include/asm-generic/hw_breakpoint.h) | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/include/asm/hw_breakpoint.h b/arch/x86/include/asm/hw_breakpoint.h index 1acb4d45de7..3cfca8e2b5f 100644 --- a/arch/x86/include/asm/hw_breakpoint.h +++ b/arch/x86/include/asm/hw_breakpoint.h @@ -12,7 +12,7 @@ struct arch_hw_breakpoint { }; #include <linux/kdebug.h> -#include <asm-generic/hw_breakpoint.h> +#include <linux/hw_breakpoint.h> /* Available HW breakpoint length encodings */ #define HW_BREAKPOINT_LEN_1 0x40 diff --git a/include/asm-generic/hw_breakpoint.h b/include/linux/hw_breakpoint.h index 9bf2d12eb74..61ccc8f17ea 100644 --- a/include/asm-generic/hw_breakpoint.h +++ b/include/linux/hw_breakpoint.h @@ -1,9 +1,6 @@ -#ifndef _ASM_GENERIC_HW_BREAKPOINT_H -#define _ASM_GENERIC_HW_BREAKPOINT_H +#ifndef _LINUX_HW_BREAKPOINT_H +#define _LINUX_HW_BREAKPOINT_H -#ifndef __ARCH_HW_BREAKPOINT_H -#error "Please don't include this file directly" -#endif #ifdef __KERNEL__ #include <linux/list.h> @@ -136,4 +133,4 @@ extern void unregister_kernel_hw_breakpoint(struct hw_breakpoint *bp); extern unsigned int hbp_kernel_pos; #endif /* __KERNEL__ */ -#endif /* _ASM_GENERIC_HW_BREAKPOINT_H */ +#endif /* _LINUX_HW_BREAKPOINT_H */ |