aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/kernel/signal.c6
1 files changed, 1 insertions, 5 deletions
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
223handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, 223handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
224 sigset_t *oldset, struct pt_regs *regs, int syscall) 224 sigset_t *oldset, struct pt_regs *regs, int syscall)
225{ 225{
226 sigset_t blocked;
227 int ret; 226 int ret;
228 227
229 /* 228 /*
@@ -244,10 +243,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
244 /* 243 /*
245 * Block the signal if we were successful. 244 * Block the signal if we were successful.
246 */ 245 */
247 sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask); 246 block_sigmask(ka, sig);
248 if (!(ka->sa.sa_flags & SA_NODEFER))
249 sigaddset(&blocked, sig);
250 set_current_blocked(&blocked);
251} 247}
252 248
253/* 249/*