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

Don't call the ->break_handler() from the s390 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: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-arch@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Link: https://lore.kernel.org/lkml/152942485849.15209.16608277783809018031.stgit@devbox
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 0967de19f53dc4bf3adcda0557074d2f7e40cd6f..3e34018960b54caeeed80927087c4b0e192f66b4 100644 (file)
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -332,26 +332,6 @@ static int kprobe_handler(struct pt_regs *regs)
                }
                enable_singlestep(kcb, regs, (unsigned long) p->ainsn.insn);
                return 1;
-       } else if (kprobe_running()) {
-               p = __this_cpu_read(current_kprobe);
-               if (p->break_handler && p->break_handler(p, regs)) {
-                       /*
-                        * Continuation after the jprobe completed and
-                        * caused the jprobe_return trap. The jprobe
-                        * break_handler "returns" to the original
-                        * function that still has the kprobe breakpoint
-                        * installed. We continue with single stepping.
-                        */
-                       kcb->kprobe_status = KPROBE_HIT_SS;
-                       enable_singlestep(kcb, regs,
-                                         (unsigned long) p->ainsn.insn);
-                       return 1;
-               } /* else:
-                  * No kprobe at this address and the current kprobe
-                  * has no break handler (no jprobe!). The kernel just
-                  * exploded, let the standard trap handler pick up the
-                  * pieces.
-                  */
        } /* else:
           * No kprobe at this address and no active kprobe. The trap has
           * not been caused by a kprobe breakpoint. The race of breakpoint