From 551c88f768c011096d69c862d3eb23308fdfbef9 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Tue, 14 Feb 2012 11:40:57 +0000
Subject: [PATCH] --- yaml --- r: 295304 b: refs/heads/master c:
 d8d4b20df48287a7e9e37f706c410b13bc0438cf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9936a7ed4d98..4f83939ebecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e933c70de0e2590d41f5edd3133e7ee12b4e0bc6
+refs/heads/master: d8d4b20df48287a7e9e37f706c410b13bc0438cf
diff --git a/trunk/arch/openrisc/kernel/signal.c b/trunk/arch/openrisc/kernel/signal.c
index 14764e827a67..cf35ea032a70 100644
--- a/trunk/arch/openrisc/kernel/signal.c
+++ b/trunk/arch/openrisc/kernel/signal.c
@@ -102,10 +102,7 @@ asmlinkage long _sys_rt_sigreturn(struct pt_regs *regs)
 		goto badframe;
 
 	sigdelsetmask(&set, ~_BLOCKABLE);
-	spin_lock_irq(&current->sighand->siglock);
-	current->blocked = set;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
+	set_current_blocked(&set);
 
 	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
 		goto badframe;
@@ -265,13 +262,7 @@ handle_signal(unsigned long sig,
 	if (ret)
 		return ret;
 
-	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;
 }