Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47f86b4e authored by Anton Blanchard's avatar Anton Blanchard
Browse files

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: default avatarAnton Blanchard <anton@samba.org>
parent 5e66684f

arch/powerpc/include/asm/kprobes.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/ptrace.h>

#include <linux/ptrace.h>

#include <linux/percpu.h>

#include <linux/percpu.h>

#include <asm/probes.h>

#include <asm/probes.h>

#include <asm/code-patching.h>





#define  __ARCH_WANT_KPROBES_INSN_SLOT

#define  __ARCH_WANT_KPROBES_INSN_SLOT
@@ -56,9 +57,9 @@ typedef ppc_opcode_t kprobe_opcode_t; 
		if ((colon = strchr(name, ':')) != NULL) {		\

		if ((colon = strchr(name, ':')) != NULL) {		\

			colon++;					\

			colon++;					\

			if (*colon != '\0' && *colon != '.')		\

			if (*colon != '\0' && *colon != '.')		\

				addr = *(kprobe_opcode_t **)addr;	\

				addr = (kprobe_opcode_t *)ppc_function_entry(addr); \

		} else if (name[0] != '.')				\

		} else if (name[0] != '.')				\

			addr = *(kprobe_opcode_t **)addr;		\

			addr = (kprobe_opcode_t *)ppc_function_entry(addr); \

	} else {							\

	} else {							\

		char dot_name[KSYM_NAME_LEN];				\

		char dot_name[KSYM_NAME_LEN];				\

		dot_name[0] = '.';					\

		dot_name[0] = '.';					\