diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-21 09:59:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-21 09:59:27 +0100 |
| commit | 09897d78dbc3a544426f2272b5601c62922ccab9 (patch) | |
| tree | 4c10b34aa8cbac758e5fe094a79687a9a763e28c /arch/powerpc/kernel | |
| parent | e98a6e59dff885eb387163b1a7abe019a44ba90b (diff) | |
| parent | ad439356ae5ae7688b39f1107fd5b874850fec18 (diff) | |
| download | blackbird-op-linux-09897d78dbc3a544426f2272b5601c62922ccab9.tar.gz blackbird-op-linux-09897d78dbc3a544426f2272b5601c62922ccab9.zip | |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core
Pull uprobes cleanups from Oleg Nesterov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/uprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |
