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

Commit deb3c6e6 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

sh: kprobes: Merge arch_copy_kprobe() into arch_prepare_kprobe() 



[ Upstream commit 1422ae080b66134fe192082d9b721ab7bd93fcc5 ]

arch/sh/kernel/kprobes.c:52:16: warning: no previous prototype for 'arch_copy_kprobe' [-Wmissing-prototypes]

Although SH kprobes support was only merged in v2.6.28, it missed the
earlier removal of the arch_copy_kprobe() callback in v2.6.15.

Based on the powerpc part of commit 49a2a1b8 ("[PATCH] kprobes:
changed from using spinlock to mutex").

Fixes: d39f5450 ("sh: Add kprobes support.")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Link: https://lore.kernel.org/r/717d47a19689cc944fae6e981a1ad7cae1642c89.1709326528.git.geert+renesas@glider.be


Signed-off-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 68a5a00c

arch/sh/kernel/kprobes.c

+1 −6
Original line number Diff line number Diff line
@@ -44,17 +44,12 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	if (OPCODE_RTE(opcode))

		return -EFAULT;	/* Bad breakpoint */



	memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));

	p->opcode = opcode;



	return 0;

}



void __kprobes arch_copy_kprobe(struct kprobe *p)

{

	memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));

	p->opcode = *p->addr;

}



void __kprobes arch_arm_kprobe(struct kprobe *p)

{

	*p->addr = BREAKPOINT_INSTRUCTION;