Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176688
b: refs/heads/master
c: 1be5396
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Dec 16, 2009
1 parent 9f81aa3 commit ceeac6d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: ad09750b51150ca87531b8790a379214a974c167
refs/heads/master: 1be53963b0519bd3681749a9bed8b83aeb005cca
9 changes: 4 additions & 5 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1840,11 +1840,6 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,

for (;;) {
struct k_sigaction *ka;

if (unlikely(signal->group_stop_count > 0) &&
do_signal_stop(0))
goto relock;

/*
* Tracing can induce an artifical signal and choose sigaction.
* The return value in @signr determines the default action,
Expand All @@ -1856,6 +1851,10 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
if (unlikely(signr != 0))
ka = return_ka;
else {
if (unlikely(signal->group_stop_count > 0) &&
do_signal_stop(0))
goto relock;

signr = dequeue_signal(current, &current->blocked,
info);

Expand Down

0 comments on commit ceeac6d

Please sign in to comment.