Merge branch 'x86/core' into x86/apic

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

diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h
index 61ad7b5d142e1d4cc1baae2d18e186369c7907c9..bd8407863c13127f1ed7ce1384fce4086e135022 100644 (file)
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_KPROBES_H
-#define _ASM_KPROBES_H
+#ifndef ASM_X86__KPROBES_H
+#define ASM_X86__KPROBES_H
 /*
  *  Kernel Probes (KProbes)
  *
@@ -35,12 +35,12 @@ typedef u8 kprobe_opcode_t;
 #define RELATIVEJUMP_INSTRUCTION 0xe9
 #define MAX_INSN_SIZE 16
 #define MAX_STACK_SIZE 64
-#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
-       (((unsigned long)current_thread_info()) + THREAD_SIZE \
-        - (unsigned long)(ADDR))) \
-       ? (MAX_STACK_SIZE) \
-       : (((unsigned long)current_thread_info()) + THREAD_SIZE \
-          - (unsigned long)(ADDR)))
+#define MIN_STACK_SIZE(ADDR)                                          \
+       (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
+                             THREAD_SIZE - (unsigned long)(ADDR)))    \
+        ? (MAX_STACK_SIZE)                                            \
+        : (((unsigned long)current_thread_info()) +                   \
+           THREAD_SIZE - (unsigned long)(ADDR)))
 
 #define flush_insn_slot(p)     do { } while (0)
 
@@ -94,4 +94,4 @@ static inline void restore_interrupts(struct pt_regs *regs)
 extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
-#endif                         /* _ASM_KPROBES_H */
+#endif /* ASM_X86__KPROBES_H */