[S390] kprobes: single stepped breakpoint

Remove special case of a kprobe on a breakpoint while a relocated
instruction is single stepped. The only instruction that may cause
a fault while kprobe single stepping is active is the relocated
instruction. There is no kprobe on the instruction slot retrieved
with get_insn_slot().

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 2564793ec2b6fd0dede210f10694615606239511..b8e51759b6e4494dbaf900afec767ff4e4721ab9 100644 (file)
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -273,12 +273,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
        if (kprobe_running()) {
                p = get_kprobe(addr);
                if (p) {
-                       if (kcb->kprobe_status == KPROBE_HIT_SS &&
-                           *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
-                               regs->psw.mask &= ~PSW_MASK_PER;
-                               regs->psw.mask |= kcb->kprobe_saved_imask;
-                               goto no_kprobe;
-                       }
                        /* We have reentered the kprobe_handler(), since
                         * another probe was hit while within the handler.
                         * We here save the original kprobes variables and