Commit 9b85753d authored Jun 20, 2018 by Masami Hiramatsu Committed by Ingo Molnar Jun 21, 2018

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: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Thomas 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@devbox


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent cf3bb032

arch/mips/kernel/kprobes.c

+7 −14

Original line number	Diff line number	Diff line
		@@ -326,19 +326,13 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
		preempt_enable_no_resched();
		}
		return 1;
		} else {
		if (addr->word != breakpoint_insn.word) {
		} else if (addr->word != breakpoint_insn.word) {
		/*
		* The breakpoint instruction was removed by
		* another cpu right after we hit, no further
		* handling of this interrupt is appropriate
		*/
		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;
		}
		@@ -367,7 +361,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
		return 1;
		}

		ss_probe:
		prepare_singlestep(p, regs, kcb);
		if (kcb->flags & SKIP_DELAYSLOT) {
		kcb->kprobe_status = KPROBE_HIT_SSDONE;