summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-22 11:33:45 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-22 07:52:39 +0400
commitf2ccfb3e565f51f1063d68f119d5b42a7f5fd984 (patch)
treec810ac134bdcb6647ab5fb69f743aededa198dea /arch
parent58e4257bc6336db015673a8cb598bd6cdbecf6d1 (diff)
downloadlinux-f2ccfb3e565f51f1063d68f119d5b42a7f5fd984.tar.xz
score: ->restart_block.fn needs to be reset on rt_sigreturn
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/score/kernel/signal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/score/kernel/signal.c b/arch/score/kernel/signal.c
index 5a5bd1763336..c3fded7357f0 100644
--- a/arch/score/kernel/signal.c
+++ b/arch/score/kernel/signal.c
@@ -152,6 +152,9 @@ score_rt_sigreturn(struct pt_regs *regs)
stack_t st;
int sig;
+ /* 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->regs[0];
if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe;