From 802ce84ce08eb86d60beebcefc05b3e56bbbd6ce Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed, 5 Jan 2011 12:47:16 +0100
Subject: [PATCH] --- yaml --- r: 227228 b: refs/heads/master c:
 35f2aaa79a2d484c8449f34461464a1e84e36e2b h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/s390/kernel/kprobes.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 78ca14edb90d..6750e3b9ee65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f9a3c330652b0fdb65d89e94977a8e79fe730e7
+refs/heads/master: 35f2aaa79a2d484c8449f34461464a1e84e36e2b
diff --git a/trunk/arch/s390/kernel/kprobes.c b/trunk/arch/s390/kernel/kprobes.c
index 2564793ec2b6..b8e51759b6e4 100644
--- a/trunk/arch/s390/kernel/kprobes.c
+++ b/trunk/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