From 2594752fadff458d7392c4920f3d5808119737d9 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Fri, 11 May 2012 10:58:05 +1000 Subject: [PATCH] --- yaml --- r: 306037 b: refs/heads/master c: 60c597513ee93fc6a0b7f2cb83d0aa67d4204cf1 h: refs/heads/master i: 306035: ad9d19fe81fc1956351b8d01b6b415f6b8098b1a v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/signal.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 4a8b274003ef..aa3bb7d508c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcb8c8d0b7131df1b5aad011db33e17f8def5d0b +refs/heads/master: 60c597513ee93fc6a0b7f2cb83d0aa67d4204cf1 diff --git a/trunk/arch/microblaze/kernel/signal.c b/trunk/arch/microblaze/kernel/signal.c index f2c13d5a6261..99b970866b29 100644 --- a/trunk/arch/microblaze/kernel/signal.c +++ b/trunk/arch/microblaze/kernel/signal.c @@ -105,10 +105,7 @@ asmlinkage long 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, &rval)) goto badframe; @@ -326,12 +323,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, if (ret) return ret; - 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; }