frv: double syscall restarts, syscall restart in sigreturn()

We need to make sure that only the first do_signal() to be handled on
the way out syscall will bother with syscall restarts; additionally, the
check on the "signal has user handler" path had been wrong - compare
with restart prevention in sigreturn()...

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

diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index bd13b57a5c9b046a825f8b2907888d58e7e5b27b..bab01298b58ee2873fd7ef85de9230ac7af354f7 100644 (file)
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -446,7 +446,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
        int ret;
 
        /* Are we from a system call? */
        int ret;
 
        /* Are we from a system call? */

-       if (in_syscall(__frame)) {
+       if (__frame->syscallno != -1) {

                /* If so, check system call restarting.. */
                switch (__frame->gr8) {
                case -ERESTART_RESTARTBLOCK:
                /* If so, check system call restarting.. */
                switch (__frame->gr8) {
                case -ERESTART_RESTARTBLOCK:


@@ -465,6 +465,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
                        __frame->gr8 = __frame->orig_gr8;
                        __frame->pc -= 4;
                }
                        __frame->gr8 = __frame->orig_gr8;
                        __frame->pc -= 4;
                }

+               __frame->syscallno = -1;

        }
 
        /* Set up the stack frame */
        }
 
        /* Set up the stack frame */


@@ -551,6 +552,7 @@ no_signal:
                        __frame->pc -= 4;
                        break;
                }
                        __frame->pc -= 4;
                        break;
                }

+               __frame->syscallno = -1;

        }
 
        /* if there's no signal to deliver, we just put the saved sigmask
        }
 
        /* if there's no signal to deliver, we just put the saved sigmask