From 7cd6864bcf926e4a352ac2477a708e388fdf9185 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 26 Sep 2010 19:28:52 +0100
Subject: [PATCH] --- yaml --- r: 211010 b: refs/heads/master c:
 c05628b49b19187841d635dddd3e47caab33242b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0eedc9c6d323..24b6e3f1f6b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00cbf6080c7d60b999864afcd9010e0bbc7c5db6
+refs/heads/master: c05628b49b19187841d635dddd3e47caab33242b
diff --git a/trunk/arch/mn10300/kernel/signal.c b/trunk/arch/mn10300/kernel/signal.c
index 4ef99256fa49..5a2c0040b166 100644
--- a/trunk/arch/mn10300/kernel/signal.c
+++ b/trunk/arch/mn10300/kernel/signal.c
@@ -102,6 +102,9 @@ static int restore_sigcontext(struct pt_regs *regs,
 {
 	unsigned int err = 0;
 
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 	if (is_using_fpu(current))
 		fpu_kill_state(current);