Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306032
b: refs/heads/master
c: 80c1dfa
h: refs/heads/master
v: v3
  • Loading branch information
Matt Fleming authored and Al Viro committed May 22, 2012
1 parent dd9ecaf commit 61b7565
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 97c47bb70728c765d6cbf582759f9170fe152ded
refs/heads/master: 80c1dfa91c44665f2cecc1666050b2e8e04cef68
14 changes: 8 additions & 6 deletions trunk/arch/score/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,14 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
*/
ret = setup_rt_frame(ka, regs, sig, oldset, info);

spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked, sig);
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
if (ret == 0) {
spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked, sig);
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
}

return ret;
}
Expand Down

0 comments on commit 61b7565

Please sign in to comment.