From 4561d9170bbcfb9adcd0adc35a61e0f0a717f3b9 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Fri, 23 Mar 2012 15:02:43 -0700
Subject: [PATCH] --- yaml --- r: 295262 b: refs/heads/master c:
 43aca3246cb7f736b20c11da9ce932a124a2a85a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cb13cc9ba7e3..8a21564d5c16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee00560c7dac1dbbf048446a8489550d0a5765b7
+refs/heads/master: 43aca3246cb7f736b20c11da9ce932a124a2a85a
diff --git a/trunk/arch/hexagon/kernel/signal.c b/trunk/arch/hexagon/kernel/signal.c
index b45be3181193..ecbab3457606 100644
--- a/trunk/arch/hexagon/kernel/signal.c
+++ b/trunk/arch/hexagon/kernel/signal.c
@@ -192,12 +192,7 @@ static int handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
 	if (rc)
 		return rc;
 
-	spin_lock_irq(&current->sighand->siglock);
-	sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
-	if (!(ka->sa.sa_flags & SA_NODEFER))
-		sigaddset(&current->blocked, sig);
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	block_sigmask(ka, sig);
 
 	return 0;
 }
@@ -305,10 +300,7 @@ asmlinkage int sys_rt_sigreturn(void)
 		goto badframe;
 
 	sigdelsetmask(&blocked, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-	current->blocked = blocked;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	set_current_blocked(&blocked);
 
 	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
 		goto badframe;