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

Commit 3d78e945 authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes/powerpc: Kill arch_uprobe->ainsn 



powerpc has both arch_uprobe->insn and arch_uprobe->ainsn to
make the generic code happy. This is no longer needed after
the previous change, powerpc can just use "u32 insn".

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
parent 803200e2

arch/powerpc/include/asm/uprobes.h

+2 −3
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ typedef ppc_opcode_t uprobe_opcode_t; 


struct arch_uprobe {

	union {

		u8	insn[MAX_UINSN_BYTES];

		u8	ixol[MAX_UINSN_BYTES];

		u32	ainsn;

		u32	insn;

		u32	ixol;

	};

};

arch/powerpc/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs) 
	 * emulate_step() returns 1 if the insn was successfully emulated.

	 * For all other cases, we need to single-step in hardware.

	 */

	ret = emulate_step(regs, auprobe->ainsn);

	ret = emulate_step(regs, auprobe->insn);

	if (ret > 0)

		return true;