Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[powerpc.git] / include / asm-i386 / kprobes.h

diff --git a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h
index 0730a20..06f7303 100644 (file)
--- a/include/asm-i386/kprobes.h
+++ b/include/asm-i386/kprobes.h
@@ -42,9 +42,9 @@ typedef u8 kprobe_opcode_t;
        ? (MAX_STACK_SIZE) \
        : (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
 
-#define JPROBE_ENTRY(pentry)   (kprobe_opcode_t *)pentry
 #define ARCH_SUPPORTS_KRETPROBES
 #define  ARCH_INACTIVE_KPROBE_COUNT 0
+#define flush_insn_slot(p)     do { } while (0)
 
 void arch_remove_kprobe(struct kprobe *p);
 void kretprobe_trampoline(void);