---

yaml --- r: 210837 b: refs/heads/master c: 20cd514 h: refs/heads/master i: 210835: 1bfb4ed v: v3
git-mirror · Sep 20, 2010 · 1015b77 · 1015b77
1 parent 70c1592
commit 1015b77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c4a3d3a0f84a5847665f8aa0552d188389f791
+refs/heads/master: 20cd514d0f3d288d968217028ca67b70e707d896
diff --git a/trunk/arch/frv/kernel/signal.c b/trunk/arch/frv/kernel/signal.c
@@ -121,6 +121,9 @@ static int restore_sigcontext(struct sigcontext __user *sc, int *_gr8)
 	struct user_context *user = current->thread.user;
 	unsigned long tbr, psr;
 
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 	tbr = user->i.tbr;
 	psr = user->i.psr;
 	if (copy_from_user(user, &sc->sc_context, sizeof(sc->sc_context)))