From 59389d69e93082d2499b97d68a859a9f08382414 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@intel.com>
Date: Fri, 11 May 2012 10:58:06 +1000
Subject: [PATCH] --- yaml --- r: 306030 b: refs/heads/master c:
 9ae36796020998fcd07431934be6b160e9c7bfce h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8360609f5e32..a547461acec3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e3f9f65cb722d3663032b97ca76377b864f3835
+refs/heads/master: 9ae36796020998fcd07431934be6b160e9c7bfce
diff --git a/trunk/arch/unicore32/kernel/signal.c b/trunk/arch/unicore32/kernel/signal.c
index 911b549a6df5..72d953190419 100644
--- a/trunk/arch/unicore32/kernel/signal.c
+++ b/trunk/arch/unicore32/kernel/signal.c
@@ -370,10 +370,7 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,
 	/*
 	 * Block the signal if we were successful.
 	 */
-	sigorsets(&blocked, &tsk->blocked, &ka->sa.sa_mask);
-	if (!(ka->sa.sa_flags & SA_NODEFER))
-		sigaddset(&blocked, sig);
-	set_current_blocked(&blocked);
+	block_sigmask(ka, sig);
 
 	return 0;
 }