From 98ada33ee1d24a7347c80f88d033a08e6ebfb562 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 26 Apr 2012 23:42:55 -0400
Subject: [PATCH] --- yaml --- r: 310075 b: refs/heads/master c:
 39974d085d003163f61c65917c22d6c7620ffdb6 h: refs/heads/master i:   310073:
 5970857544a58177c55ce966e161ce180881dfa6   310071:
 74992557461a63fda53ca35ac6a49b2bbcac7fb3 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/openrisc/kernel/signal.c | 20 ++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 95869eddaab0..f89f6b086a36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7f9a11a6cf1ea9ee6be3eb2b90d91327a09ad14
+refs/heads/master: 39974d085d003163f61c65917c22d6c7620ffdb6
diff --git a/trunk/arch/openrisc/kernel/signal.c b/trunk/arch/openrisc/kernel/signal.c
index 721c584ff44a..6c41778410e6 100644
--- a/trunk/arch/openrisc/kernel/signal.c
+++ b/trunk/arch/openrisc/kernel/signal.c
@@ -251,7 +251,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	return -EFAULT;
 }
 
-static inline int
+static inline void
 handle_signal(unsigned long sig,
 	      siginfo_t *info, struct k_sigaction *ka,
 	      struct pt_regs *regs)
@@ -260,11 +260,13 @@ handle_signal(unsigned long sig,
 
 	ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
 	if (ret)
-		return ret;
+		return;
 
 	block_sigmask(ka, sig);
+	clear_thread_flag(TIF_RESTORE_SIGMASK);
 
-	return 0;
+	tracehook_signal_handler(sig, info, ka, regs,
+				 test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -341,18 +343,8 @@ void do_signal(struct pt_regs *regs)
 		 * back */
 		restore_saved_sigmask();
 	} else {		/* signr > 0 */
-
 		/* Whee!  Actually deliver the signal.  */
-		if (!handle_signal(signr, &info, &ka, regs)) {
-			/* a signal was successfully delivered; the saved
-			 * sigmask will have been stored in the signal frame,
-			 * and will be restored by sigreturn, so we can simply
-			 * clear the TIF_RESTORE_SIGMASK flag */
-			clear_thread_flag(TIF_RESTORE_SIGMASK);
-		}
-
-		tracehook_signal_handler(signr, &info, &ka, regs,
-					 test_thread_flag(TIF_SINGLESTEP));
+		handle_signal(signr, &info, &ka, regs);
 	}
 
 	return;