From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 22 Apr 2012 07:36:05 +0000 (-0400)
Subject: avr32: ->restart_block.fn needs to be reset on rt_sigreturn
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=446cdd13275bfa38b858a1e99dbd61c07c9767c0;p=deliverable%2Flinux.git

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

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

diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index feeb77bd81c7..a4855aecbe44 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -77,6 +77,9 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
 	struct rt_sigframe __user *frame;
 	sigset_t set;
 
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
 	frame = (struct rt_sigframe __user *)regs->sp;
 	pr_debug("SIG return: frame = %p\n", frame);