From 982dde085962c4c6d80eb2d9aec633baea85aeea Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 18 Sep 2010 08:38:47 -0400 Subject: [PATCH] --- yaml --- r: 210831 b: refs/heads/master c: 2deba1bd7126aadb5750beb927c878a6490065e6 h: refs/heads/master i: 210829: 622e8c1ff9ec33f11e71833ba9acf287fcb1fddb 210827: 603e8fdb2abcd2fac02b73f72179cbb643cd7ae7 210823: b2b4fa143b0978b71b48fd7bea06ef9696dc9bfd 210815: 2af6978e4f4ebc1422e0d12b5093d232c9646fe1 v: v3 --- [refs] | 2 +- trunk/arch/alpha/kernel/signal.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e481f8d9c15b..757c6a712551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdc8b8914b17cf97b53e5f7af8168d68cfb089d6 +refs/heads/master: 2deba1bd7126aadb5750beb927c878a6490065e6 diff --git a/trunk/arch/alpha/kernel/signal.c b/trunk/arch/alpha/kernel/signal.c index 0932dbb1ef8e..e5b1b3c79ff3 100644 --- a/trunk/arch/alpha/kernel/signal.c +++ b/trunk/arch/alpha/kernel/signal.c @@ -239,6 +239,8 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned long usp; long i, err = __get_user(regs->pc, &sc->sc_pc); + current_thread_info()->restart_block.fn = do_no_restart_syscall; + sw->r26 = (unsigned long) ret_from_sys_call; err |= __get_user(regs->r0, sc->sc_regs+0); @@ -591,7 +593,6 @@ syscall_restart(unsigned long r0, unsigned long r19, regs->pc -= 4; break; case ERESTART_RESTARTBLOCK: - current_thread_info()->restart_block.fn = do_no_restart_syscall; regs->r0 = EINTR; break; }