Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306030
b: refs/heads/master
c: 9ae3679
h: refs/heads/master
v: v3
  • Loading branch information
Matt Fleming authored and Al Viro committed May 22, 2012
1 parent 1b00fb7 commit 59389d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 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: 8e3f9f65cb722d3663032b97ca76377b864f3835
refs/heads/master: 9ae36796020998fcd07431934be6b160e9c7bfce
5 changes: 1 addition & 4 deletions trunk/arch/unicore32/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,7 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka,
/*
* Block the signal if we were successful.
*/
sigorsets(&blocked, &tsk->blocked, &ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&blocked, sig);
set_current_blocked(&blocked);
block_sigmask(ka, sig);

return 0;
}
Expand Down

0 comments on commit 59389d6

Please sign in to comment.