From 940c56452492c2729054b06179062e1fb9c289b3 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 20 Sep 2006 15:58:54 +0200
Subject: [PATCH] --- yaml --- r: 34167 b: refs/heads/master c:
 8427082a506f7ae0abf82ce0047a045ec4309e59 h: refs/heads/master i:   34165:
 ded7009c66fbc03e97cb10c917cb5be96da447cf   34163:
 96517ca5d0527e0f76dd47a7be32fa9e8346d5e3   34159:
 ee1f5c7facce2c832db2c6d7d9769fb10d501a6f v: v3

---
 [refs]                          | 2 +-
 trunk/arch/s390/kernel/signal.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b92afb64083..7c298ef5d98d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39b083fe1c3c7b88939f6fa1b0b96e579f12e96f
+refs/heads/master: 8427082a506f7ae0abf82ce0047a045ec4309e59
diff --git a/trunk/arch/s390/kernel/signal.c b/trunk/arch/s390/kernel/signal.c
index a887b686f279..dd05423f87a8 100644
--- a/trunk/arch/s390/kernel/signal.c
+++ b/trunk/arch/s390/kernel/signal.c
@@ -457,6 +457,7 @@ void do_signal(struct pt_regs *regs)
 		case -ERESTART_RESTARTBLOCK:
 			regs->gprs[2] = -EINTR;
 		}
+		regs->trap = -1;	/* Don't deal with this again. */
 	}
 
 	/* Get signal to deliver.  When running under ptrace, at this point