avr32: ->restart_block.fn needs to be reset on rt_sigreturn
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 22 Apr 2012 07:36:05 +0000 (03:36 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 22 May 2012 03:52:40 +0000 (23:52 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
arch/avr32/kernel/signal.c

index feeb77b..a4855ae 100644 (file)
@@ -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);