Commit 9b85753d authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar

MIPS/kprobes: Don't call the ->break_handler() in MIPS kprobes code

Don't call the ->break_handler() from the MIPS kprobes code,
because it was only used by jprobes which got removed.
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-arch@vger.kernel.org
Cc: linux-mips@linux-mips.org
Link: https://lore.kernel.org/lkml/152942482953.15209.843924518200700137.stgit@devboxSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent cf3bb032
...@@ -326,19 +326,13 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) ...@@ -326,19 +326,13 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
preempt_enable_no_resched(); preempt_enable_no_resched();
} }
return 1; return 1;
} else { } else if (addr->word != breakpoint_insn.word) {
if (addr->word != breakpoint_insn.word) { /*
/* * The breakpoint instruction was removed by
* The breakpoint instruction was removed by * another cpu right after we hit, no further
* another cpu right after we hit, no further * handling of this interrupt is appropriate
* handling of this interrupt is appropriate */
*/ ret = 1;
ret = 1;
goto no_kprobe;
}
p = __this_cpu_read(current_kprobe);
if (p->break_handler && p->break_handler(p, regs))
goto ss_probe;
} }
goto no_kprobe; goto no_kprobe;
} }
...@@ -367,7 +361,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) ...@@ -367,7 +361,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
return 1; return 1;
} }
ss_probe:
prepare_singlestep(p, regs, kcb); prepare_singlestep(p, regs, kcb);
if (kcb->flags & SKIP_DELAYSLOT) { if (kcb->flags & SKIP_DELAYSLOT) {
kcb->kprobe_status = KPROBE_HIT_SSDONE; kcb->kprobe_status = KPROBE_HIT_SSDONE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment