---

yaml --- r: 34167 b: refs/heads/master c: 8427082 h: refs/heads/master i: 34165: ded7009 34163: 96517ca 34159: ee1f5c7 v: v3
git-mirror · Sep 20, 2006 · 940c564 · 940c564
1 parent 924b953
commit 940c564
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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