Commit 54bbf3e3 authored by Matt Fleming's avatar Matt Fleming Committed by Al Viro

avr32: use block_sigmask()

Use the new helper function introduced in commit 5e6292c0 ("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: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Havard Skinnemoen <hskinnemoen@gmail.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 49209590
...@@ -223,7 +223,6 @@ static inline void ...@@ -223,7 +223,6 @@ static inline void
handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *oldset, struct pt_regs *regs, int syscall) sigset_t *oldset, struct pt_regs *regs, int syscall)
{ {
sigset_t blocked;
int ret; int ret;
/* /*
...@@ -244,10 +243,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, ...@@ -244,10 +243,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
/* /*
* Block the signal if we were successful. * Block the signal if we were successful.
*/ */
sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask); block_sigmask(ka, sig);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&blocked, sig);
set_current_blocked(&blocked);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment