powerpc/kprobes: Fix ABIv2 issues with kprobe_lookup_name

Use ppc_function_entry in places where we previously assumed
function descriptors exist.

Signed-off-by: Anton Blanchard <anton@samba.org>

diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h
index 7b6feab6fd26f26cfc3c19456f163845d72db86e..af15d4d8d604c79ab7f09066c1cacfe37d30c7f7 100644 (file)
--- a/arch/powerpc/include/asm/kprobes.h
+++ b/arch/powerpc/include/asm/kprobes.h
@@ -30,6 +30,7 @@
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
 #include <asm/probes.h>
+#include <asm/code-patching.h>
 
 #define  __ARCH_WANT_KPROBES_INSN_SLOT
 
@@ -56,9 +57,9 @@ typedef ppc_opcode_t kprobe_opcode_t;
                if ((colon = strchr(name, ':')) != NULL) {              \
                        colon++;                                        \
                        if (*colon != '\0' && *colon != '.')            \
-                               addr = *(kprobe_opcode_t **)addr;       \
+                               addr = (kprobe_opcode_t *)ppc_function_entry(addr); \
                } else if (name[0] != '.')                              \
-                       addr = *(kprobe_opcode_t **)addr;               \
+                       addr = (kprobe_opcode_t *)ppc_function_entry(addr); \
        } else {                                                        \
                char dot_name[KSYM_NAME_LEN];                           \
                dot_name[0] = '.';                                      \