Re: [PATCH 2/2] uprobes/powerpc: Kill arch_uprobe->ainsn
On Sat, Nov 09, 2013 at 06:54:09PM +0100, Oleg Nesterov wrote: > 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: Oleg Nesterov > --- > arch/powerpc/include/asm/uprobes.h |5 ++--- > arch/powerpc/kernel/uprobes.c |2 +- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/include/asm/uprobes.h > b/arch/powerpc/include/asm/uprobes.h > index 75c6ecd..7422a99 100644 > --- a/arch/powerpc/include/asm/uprobes.h > +++ b/arch/powerpc/include/asm/uprobes.h > @@ -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; > }; > }; > > diff --git a/arch/powerpc/kernel/uprobes.c b/arch/powerpc/kernel/uprobes.c > index 59f419b..003b209 100644 > --- a/arch/powerpc/kernel/uprobes.c > +++ b/arch/powerpc/kernel/uprobes.c > @@ -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; Acked-by: Ananth N Mavinakayanahalli Thanks Oleg. Ananth -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] uprobes/powerpc: Kill arch_uprobe->ainsn
* Oleg Nesterov [2013-11-09 18:54:09]: > 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: Oleg Nesterov Acked-by: Srikar Dronamraju -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/2] 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: Oleg Nesterov --- arch/powerpc/include/asm/uprobes.h |5 ++--- arch/powerpc/kernel/uprobes.c |2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/uprobes.h b/arch/powerpc/include/asm/uprobes.h index 75c6ecd..7422a99 100644 --- a/arch/powerpc/include/asm/uprobes.h +++ b/arch/powerpc/include/asm/uprobes.h @@ -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; }; }; diff --git a/arch/powerpc/kernel/uprobes.c b/arch/powerpc/kernel/uprobes.c index 59f419b..003b209 100644 --- a/arch/powerpc/kernel/uprobes.c +++ b/arch/powerpc/kernel/uprobes.c @@ -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; -- 1.5.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/