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

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



Don't call the ->break_handler() from the arm64 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>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/lkml/152942474231.15209.17684808374429473004.stgit@devbox


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

parent 75feff53

arch/arm64/kernel/probes/kprobes.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -408,14 +408,6 @@ static void __kprobes kprobe_handler(struct pt_regs *regs)
		return;
		}
		}
		} else if ((le32_to_cpu((kprobe_opcode_t ) addr) ==
		BRK64_OPCODE_KPROBES) && cur_kprobe) {
		/* We probably hit a jprobe. Call its break handler. */
		if (cur_kprobe->break_handler &&
		cur_kprobe->break_handler(cur_kprobe, regs)) {
		setup_singlestep(cur_kprobe, regs, kcb, 0);
		return;
		}
		}
		/*
		* The breakpoint instruction was removed right