From: Matt Fleming Date: Fri, 19 Aug 2011 16:46:22 +0000 (+0100) Subject: avr32: Use block_sigmask() X-Git-Tag: next-20110826~16^2~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9957ad454eec065334f0031811e064d33e9294d;p=karo-tx-linux.git avr32: Use block_sigmask() Use the new helper function block_sigmask() 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. Cc: Oleg Nesterov Cc: Hans-Christian Egtvedt Cc: Havard Skinnemoen Signed-off-by: Matt Fleming Signed-off-by: Oleg Nesterov --- diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c index 06f4293f85d8..feeb77bd81c7 100644 --- a/arch/avr32/kernel/signal.c +++ b/arch/avr32/kernel/signal.c @@ -223,7 +223,6 @@ static inline void handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs, int syscall) { - sigset_t blocked; int ret; /* @@ -244,10 +243,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, /* * Block the signal if we were successful. */ - sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask); - if (!(ka->sa.sa_flags & SA_NODEFER)) - sigaddset(&blocked, sig); - set_current_blocked(&blocked); + block_sigmask(ka, sig); } /*