---

yaml --- r: 306047 b: refs/heads/master c: 85a847f h: refs/heads/master i: 306045: eabf5a7 306043: 94aa117 306039: 49bf337 306031: dd9ecaf 306015: f00308f 305983: e919b40 305919: e19180d v: v3
git-mirror · May 22, 2012 · 02fd2ad · 02fd2ad
1 parent 60d64a3
commit 02fd2ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a35995562495bd70a87b5d3a2e820036ee6597
+refs/heads/master: 85a847ffad1d4ee94590db25bad444d18a8db263
diff --git a/trunk/arch/parisc/kernel/signal.c b/trunk/arch/parisc/kernel/signal.c
@@ -109,6 +109,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
 		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
 #endif
 
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
 	/* Unwind the user stack to get the rt_sigframe structure. */
 	frame = (struct rt_sigframe __user *)
@@ -466,8 +467,6 @@ syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
 	/* Check the return code */
 	switch (regs->gr[28]) {
 	case -ERESTART_RESTARTBLOCK:
-		current_thread_info()->restart_block.fn =
-			do_no_restart_syscall;
 	case -ERESTARTNOHAND:
 		DBG(1,"ERESTARTNOHAND: returning -EINTR\n");
 		regs->gr[28] = -EINTR;