commit c05628b49b19187841d635dddd3e47caab33242b
author Al Viro <viro@ftp.linux.org.uk> Sun Sep 26 19:28:52 2010 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 27 12:19:53 2010 -0700
tree d624d95c154ee59589f166b84e4dc178e7723d46
parent 00cbf6080c7d60b999864afcd9010e0bbc7c5db6

mn10300: ->restart_block.fn needs to be reset on sigreturn

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

arch/mn10300/kernel/signal.c

diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index 4ef9925..5a2c0040 100644
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -102,6 +102,9 @@
 {
 	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);