---

yaml --- r: 221575 b: refs/heads/master c: 34a89d2 h: refs/heads/master i: 221573: 303b45c 221571: 2834ddf 221567: 372b9b0 v: v3
git-mirror · Nov 1, 2010 · 3d948c5 · 3d948c5
1 parent fb301b1
commit 3d948c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d59e609d6568ba5ab23c256f412ac5ec360722c1
+refs/heads/master: 34a89d26bdc4ba46a406fa3842239e921c493d44
diff --git a/trunk/arch/tile/kernel/signal.c b/trunk/arch/tile/kernel/signal.c
@@ -330,7 +330,7 @@ void do_signal(struct pt_regs *regs)
 			current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
 		}
 
-		return;
+		goto done;
 	}
 
 	/* Did we come from a system call? */
@@ -358,4 +358,8 @@ void do_signal(struct pt_regs *regs)
 		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
 		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
 	}
+
+done:
+	/* Avoid double syscall restart if there are nested signals. */
+	regs->faultnum = INT_SWINT_1_SIGRETURN;
 }