summaryrefslogtreecommitdiff
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2012-12-30 15:54:08 +0100
committerOleg Nesterov <oleg@redhat.com>2013-02-08 17:47:11 +0100
commit74e59dfc6b19e3472a7c16ad57bc831e6e647895 (patch)
tree5047f177b6c604f83d4b9f62614acf93a08d34bd /arch/x86/kernel
parentcf31ec3f7fece93f3fce3ee5964e27857141ea47 (diff)
uprobes: Change handle_swbp() to expose bp_vaddr to handler_chain()
Change handle_swbp() to set regs->ip = bp_vaddr in advance, this is what consumer->handler() needs but uprobe_get_swbp_addr() is not exported. This also simplifies the code and makes it more consistent across the supported architectures. handle_swbp() becomes the only caller of uprobe_get_swbp_addr(). Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/uprobes.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 4e33a35d659e..0ba4cfb4f412 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -681,7 +681,6 @@ static bool __skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
continue;
if (auprobe->insn[i] == 0x90) {
- regs->ip = uprobe_get_swbp_addr(regs);
regs->ip += i + 1;
return true;
}