Merge commit 'v2.6.26' into core/locking

[safe/jmp/linux-2.6] / include / asm-x86 / kprobes.h

diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h
index 6e6371a..54980b0 100644 (file)
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
@@ -35,14 +35,13 @@ 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 ARCH_SUPPORTS_KRETPROBES
 #define flush_insn_slot(p)     do { } while (0)
 
 extern const int kretprobe_blacklist_size;
@@ -88,7 +87,7 @@ struct kprobe_ctlblk {
  */
 static inline void restore_interrupts(struct pt_regs *regs)
 {
-       if (regs->flags & IF_MASK)
+       if (regs->flags & X86_EFLAGS_IF)
                local_irq_enable();
 }