diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2013-11-09 21:44:19 +0400 |
|---|---|---|
| committer | Oleg Nesterov <oleg@redhat.com> | 2013-11-20 19:31:01 +0400 |
| commit | 3d78e945b6249d4ef2308192343f8b203b1d7ea5 (patch) | |
| tree | a4a96d28913fd2ccf24ec31a289050107b692d8a /arch | |
| parent | 803200e24abf0f9ec18631290d26b2185477f3a6 (diff) | |
| download | linux-3d78e945b6249d4ef2308192343f8b203b1d7ea5.tar.xz | |
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 <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/uprobes.h | 5 | ||||
| -rw-r--r-- | 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 75c6ecdb8f37..7422a999a39a 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 59f419b935f2..003b20964ea0 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; |