diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2018-06-20 01:11:53 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-06-21 12:33:14 +0200 |
| commit | 75feff53a2011e8954fab02bdcef49f36a01b256 (patch) | |
| tree | 8caa7e0ab2351e8ac87b2e592ee0d667719c1bb9 | |
| parent | 5ed4b0c5d17671160c0ab74a260ae57e9352b585 (diff) | |
| download | linux-75feff53a2011e8954fab02bdcef49f36a01b256.tar.bz2 | |
ARM/kprobes: Don't call the ->break_handler() in arm kprobes code
Don't call the ->break_handler() from the arm 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: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
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/152942471328.15209.10625693210204476080.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/arm/probes/kprobes/core.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c index 23562111c511..3192350f389d 100644 --- a/arch/arm/probes/kprobes/core.c +++ b/arch/arm/probes/kprobes/core.c @@ -315,17 +315,6 @@ void __kprobes kprobe_handler(struct pt_regs *regs) reset_current_kprobe(); } } - } else if (cur) { - /* We probably hit a jprobe. Call its break handler. */ - if (cur->break_handler && cur->break_handler(cur, regs)) { - kcb->kprobe_status = KPROBE_HIT_SS; - singlestep(cur, regs, kcb); - if (cur->post_handler) { - kcb->kprobe_status = KPROBE_HIT_SSDONE; - cur->post_handler(cur, regs, 0); - } - } - reset_current_kprobe(); } else { /* * The probe was removed and a race is in progress. |