diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-01-05 12:47:16 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 12:47:23 +0100 |
| commit | 35f2aaa79a2d484c8449f34461464a1e84e36e2b (patch) | |
| tree | b19cba41c1ce3c85a69fadb319c0c82e780f5620 | |
| parent | 6f9a3c330652b0fdb65d89e94977a8e79fe730e7 (diff) | |
| download | blackbird-op-linux-35f2aaa79a2d484c8449f34461464a1e84e36e2b.tar.gz blackbird-op-linux-35f2aaa79a2d484c8449f34461464a1e84e36e2b.zip | |
[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>
| -rw-r--r-- | arch/s390/kernel/kprobes.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 2564793ec2b6..b8e51759b6e4 100644 --- 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 |
