From b854c30ddb6f0097a6939fe0dd35529598217add Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 29 Jan 2010 01:33:54 +0000
Subject: [PATCH] --- yaml --- r: 188511 b: refs/heads/master c:
 ddaebcabbc18811ac4ac6e84fb9c327e8393a1dc h: refs/heads/master i:   188509:
 8881b2d33e9951120c3c6bde8d7a75b97cc766e6   188507:
 3fbac3e8b7fefd50894e1dd975cff02a21792b10   188503:
 f50f78220ba05efca64f271581a347aa1023cda5   188495:
 6763623f324c3e639ef9733aeeec6db42744674c   188479:
 4dddfedc5e1bdf7566857e33ff72ac67a8b54ed1 v: v3

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

diff --git a/[refs] b/[refs]
index 881af9893c90..95997d616dd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e228ee9eae97b533d3b3133f76478c70dbd4294
+refs/heads/master: ddaebcabbc18811ac4ac6e84fb9c327e8393a1dc
diff --git a/trunk/arch/blackfin/kernel/signal.c b/trunk/arch/blackfin/kernel/signal.c
index 28d6f28c058c..d536f35d1f43 100644
--- a/trunk/arch/blackfin/kernel/signal.c
+++ b/trunk/arch/blackfin/kernel/signal.c
@@ -17,6 +17,7 @@
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
 #include <asm/fixed_code.h>
+#include <asm/syscall.h>
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
@@ -50,6 +51,9 @@ rt_restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *p
 	unsigned long usp = 0;
 	int err = 0;
 
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 #define RESTORE(x) err |= __get_user(regs->x, &sc->sc_##x)
 
 	/* restore passed registers */
@@ -237,6 +241,11 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
 		regs->r0 = regs->orig_r0;
 		regs->pc -= 2;
 		break;
+
+	case -ERESTART_RESTARTBLOCK:
+		regs->p0 = __NR_restart_syscall;
+		regs->pc -= 2;
+		break;
 	}
 }