From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 22 Apr 2012 07:33:45 +0000 (-0400)
Subject: score: ->restart_block.fn needs to be reset on rt_sigreturn
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f2ccfb3e565f51f1063d68f119d5b42a7f5fd984;p=deliverable%2Flinux.git

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

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;