From 7cd8e406134fec01ffe658072c5308e82046e3bf Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Fri, 11 May 2012 10:57:59 +1000 Subject: [PATCH] --- yaml --- r: 306041 b: refs/heads/master c: 3883e301bf05457d09ffc16c03ead6182ac3d732 h: refs/heads/master i: 306039: 49bf337b1d8b4b3cb8bea2c9f1e26639ea317a26 v: v3 --- [refs] | 2 +- trunk/arch/m32r/kernel/signal.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 9ca72acc7f6e..3f726d20e743 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00f35785fae2ae8a37b3a3dc1f2dc05e8f232bef +refs/heads/master: 3883e301bf05457d09ffc16c03ead6182ac3d732 diff --git a/trunk/arch/m32r/kernel/signal.c b/trunk/arch/m32r/kernel/signal.c index a08697f0886d..f54d96993ea1 100644 --- a/trunk/arch/m32r/kernel/signal.c +++ b/trunk/arch/m32r/kernel/signal.c @@ -112,10 +112,7 @@ sys_rt_sigreturn(unsigned long r0, unsigned long r1, 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, &result)) goto badframe; @@ -300,12 +297,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, if (setup_rt_frame(sig, ka, info, oldset, regs)) return -EFAULT; - 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); + block_sigmask(ka, sig); return 0; }