From 02fd2ad3cccae371c8e2b9e037ea10d168c89a0d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 22 Apr 2012 03:15:40 -0400
Subject: [PATCH] --- yaml --- r: 306047 b: refs/heads/master c:
 85a847ffad1d4ee94590db25bad444d18a8db263 h: refs/heads/master i:   306045:
 eabf5a73191e46bdc566230dd41e2b8591de3fb5   306043:
 94aa117d9131474c895b1b6f5037f4c02f00b3e1   306039:
 49bf337b1d8b4b3cb8bea2c9f1e26639ea317a26   306031:
 dd9ecaf04c483bf027cc8758a92bf9a002ef0b56   306015:
 f00308f52f5ec3cd9b2c93b4b07ec556ba6e6e54   305983:
 e919b40a9fdc9ec69ba9fe0ce7406133c1e6a2cc   305919:
 e19180dc963c59f5aad55694958563b8cc0c1fcc v: v3

---
 [refs]                            | 2 +-
 trunk/arch/parisc/kernel/signal.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0f6700782f82..151ef8b518b6 100644
--- 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
index bd36152b780e..4b9cb0d546d1 100644
--- 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;