From 79ebcec5db8f0ed7aae4f1aaa8e2de8de248b072 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Thu, 5 Apr 2012 14:25:14 -0700 Subject: [PATCH] --- yaml --- r: 298657 b: refs/heads/master c: 6e61ee3b7a1e05a8c5b76095a1ea6c3711c922cb h: refs/heads/master i: 298655: 840608c5fc157d703b3c6137ce081b488e2e897b v: v3 --- [refs] | 2 +- trunk/arch/c6x/kernel/signal.c | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 114e98701e2e..a6ed644ebf21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 389325b449caf3c73544f25bd4d6742b7f97e5dd +refs/heads/master: 6e61ee3b7a1e05a8c5b76095a1ea6c3711c922cb diff --git a/trunk/arch/c6x/kernel/signal.c b/trunk/arch/c6x/kernel/signal.c index 304f675826e9..3b5a05099989 100644 --- a/trunk/arch/c6x/kernel/signal.c +++ b/trunk/arch/c6x/kernel/signal.c @@ -85,10 +85,7 @@ asmlinkage int do_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; @@ -279,15 +276,8 @@ static int handle_signal(int sig, /* Set up the stack frame */ ret = setup_rt_frame(sig, ka, info, oldset, regs); - if (ret == 0) { - spin_lock_irq(¤t->sighand->siglock); - sigorsets(¤t->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); - } + if (ret == 0) + block_sigmask(ka, sig); return ret; }