summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatt Fleming2012-05-11 02:58:06 +0200
committerAl Viro2012-05-22 05:52:32 +0200
commit9ae36796020998fcd07431934be6b160e9c7bfce (patch)
tree3c45bc233eceb9cc1df01236cf50c07dccacc63e /arch
parentblackfin: use set_current_blocked() and block_sigmask() (diff)
downloadkernel-qcow2-linux-9ae36796020998fcd07431934be6b160e9c7bfce.tar.gz
kernel-qcow2-linux-9ae36796020998fcd07431934be6b160e9c7bfce.tar.xz
kernel-qcow2-linux-9ae36796020998fcd07431934be6b160e9c7bfce.zip
unicore32: use block_sigmask()
Use the new helper function introduced in commit 5e6292c0f28f ("signal: add block_sigmask() for adding sigmask to current->blocked") which centralises the code for updating current->blocked after successfully delivering a signal and reduces the amount of duplicate code across architectures. In the past some architectures got this code wrong, so using this helper function should stop that from happening again. Acked-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/unicore32/kernel/signal.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c
index 911b549a6df5..72d953190419 100644
--- a/arch/unicore32/kernel/signal.c
+++ b/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;
}