aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-09-18 08:38:47 -0400
committerMatt Turner <mattst88@gmail.com>2010-09-18 23:08:27 -0400
commit2deba1bd7126aadb5750beb927c878a6490065e6 (patch)
treebd044c0442c2684a5f2713857cc097ef97710bc7 /arch/alpha
parentbdc8b8914b17cf97b53e5f7af8168d68cfb089d6 (diff)
alpha: belated ERESTART_RESTARTBLOCK race fix
same thing as had been done on other targets back in 2003 - move setting ->restart_block.fn into {rt_,}sigreturn(). Tested-by: Michael Cree <mcree@orcon.net.nz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/kernel/signal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 0932dbb1ef8e..e5b1b3c79ff3 100644
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -239,6 +239,8 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
239 unsigned long usp; 239 unsigned long usp;
240 long i, err = __get_user(regs->pc, &sc->sc_pc); 240 long i, err = __get_user(regs->pc, &sc->sc_pc);
241 241
242 current_thread_info()->restart_block.fn = do_no_restart_syscall;
243
242 sw->r26 = (unsigned long) ret_from_sys_call; 244 sw->r26 = (unsigned long) ret_from_sys_call;
243 245
244 err |= __get_user(regs->r0, sc->sc_regs+0); 246 err |= __get_user(regs->r0, sc->sc_regs+0);
@@ -591,7 +593,6 @@ syscall_restart(unsigned long r0, unsigned long r19,
591 regs->pc -= 4; 593 regs->pc -= 4;
592 break; 594 break;
593 case ERESTART_RESTARTBLOCK: 595 case ERESTART_RESTARTBLOCK:
594 current_thread_info()->restart_block.fn = do_no_restart_syscall;
595 regs->r0 = EINTR; 596 regs->r0 = EINTR;
596 break; 597 break;
597 } 598 }