---

yaml --- r: 210831 b: refs/heads/master c: 2deba1b h: refs/heads/master i: 210829: 622e8c1 210827: 603e8fd 210823: b2b4fa1 210815: 2af6978 v: v3
git-mirror · Sep 19, 2010 · 982dde0 · 982dde0
1 parent 080b1e5
commit 982dde0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}