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

[deliverable/linux.git] / arch / c6x / kernel / signal.c

diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c
index 3b5a0509998994549a80d72ef440b71c1934f2cf..cf37478c1169c59411bc6926142c020a6348ec26 100644 (file)
--- a/arch/c6x/kernel/signal.c
+++ b/arch/c6x/kernel/signal.c
@@ -69,6 +69,9 @@ asmlinkage int do_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;
+
        /*
         * Since we stacked the signal on a dword boundary,
         * 'sp' should be dword aligned here.  If it's