Messages in this thread Patch in this message | | | From | David Howells <> | Subject | [PATCH 5/5] frv: double syscall restarts, syscall restart in sigreturn() | Date | Mon, 20 Sep 2010 15:13:25 +0100 |
| |
From: Al Viro <viro@ftp.linux.org.uk>
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> ---
arch/frv/kernel/signal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index bd13b57..bab0129 100644 --- 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? */ - if (in_syscall(__frame)) { + if (__frame->syscallno != -1) { /* 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->syscallno = -1; } /* Set up the stack frame */ @@ -551,6 +552,7 @@ no_signal: __frame->pc -= 4; break; } + __frame->syscallno = -1; } /* if there's no signal to deliver, we just put the saved sigmask
| |