commit 188f677f84e935f83e3d539d6e8808006f6ac62f
author Al Viro <viro@zeniv.linux.org.uk> Sun Apr 22 03:35:28 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Mon May 21 23:52:39 2012 -0400
tree 7fece57bab86bf31d46076322285bf639df8f401
parent f2ccfb3e565f51f1063d68f119d5b42a7f5fd984

xtensa: ->restart_block.fn needs to be reset on rt_sigreturn

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

arch/xtensa/kernel/signal.c

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index d78869a..44e9329 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -248,6 +248,9 @@
 	sigset_t set;
 	int ret;
 
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 	if (regs->depc > 64)
 		panic("rt_sigreturn in double exception!\n");