Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-ppc64 / kprobes.h

diff --git a/include/asm-ppc64/kprobes.h b/include/asm-ppc64/kprobes.h
index 790cf7c52774cb314c75725cc87b086dacf3e432..0802919c3235c1b5cc2debe8a0930558525e6615 100644 (file)
--- a/include/asm-ppc64/kprobes.h
+++ b/include/asm-ppc64/kprobes.h
@@ -42,6 +42,9 @@ typedef unsigned int kprobe_opcode_t;
 
 #define JPROBE_ENTRY(pentry)   (kprobe_opcode_t *)((func_descr_t *)pentry)
 
+#define ARCH_SUPPORTS_KRETPROBES
+void kretprobe_trampoline(void);
+
 /* Architecture specific copy of original instruction */
 struct arch_specific_insn {
        /* copy of original instruction */