|
@@ -87,10 +87,7 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
|
|
|
goto badframe;
|
|
|
|
|
|
sigdelsetmask(&set, ~_BLOCKABLE);
|
|
|
- spin_lock_irq(¤t->sighand->siglock);
|
|
|
- current->blocked = set;
|
|
|
- recalc_sigpending();
|
|
|
- spin_unlock_irq(¤t->sighand->siglock);
|
|
|
+ set_current_blocked(&set);
|
|
|
|
|
|
if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
|
|
|
goto badframe;
|
|
@@ -226,6 +223,7 @@ 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;
|
|
|
|
|
|
/*
|
|
@@ -246,13 +244,10 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
|
|
|
/*
|
|
|
* Block the signal if we were successful.
|
|
|
*/
|
|
|
- spin_lock_irq(¤t->sighand->siglock);
|
|
|
- sigorsets(¤t->blocked, ¤t->blocked,
|
|
|
- &ka->sa.sa_mask);
|
|
|
+ sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask);
|
|
|
if (!(ka->sa.sa_flags & SA_NODEFER))
|
|
|
- sigaddset(¤t->blocked, sig);
|
|
|
- recalc_sigpending();
|
|
|
- spin_unlock_irq(¤t->sighand->siglock);
|
|
|
+ sigaddset(&blocked, sig);
|
|
|
+ set_current_blocked(&blocked);
|
|
|
}
|
|
|
|
|
|
/*
|