diff options
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 5ccaac505e8d..e5f8aea78ffe 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -868,7 +868,6 @@ __group_complete_signal(int sig, struct task_struct *p) | |||
868 | if (t == NULL) | 868 | if (t == NULL) |
869 | /* restart balancing at this thread */ | 869 | /* restart balancing at this thread */ |
870 | t = p->signal->curr_target = p; | 870 | t = p->signal->curr_target = p; |
871 | BUG_ON(t->tgid != p->tgid); | ||
872 | 871 | ||
873 | while (!wants_signal(sig, t)) { | 872 | while (!wants_signal(sig, t)) { |
874 | t = next_thread(t); | 873 | t = next_thread(t); |
@@ -1755,9 +1754,9 @@ relock: | |||
1755 | /* Let the debugger run. */ | 1754 | /* Let the debugger run. */ |
1756 | ptrace_stop(signr, signr, info); | 1755 | ptrace_stop(signr, signr, info); |
1757 | 1756 | ||
1758 | /* We're back. Did the debugger cancel the sig or group_exit? */ | 1757 | /* We're back. Did the debugger cancel the sig? */ |
1759 | signr = current->exit_code; | 1758 | signr = current->exit_code; |
1760 | if (signr == 0 || current->signal->flags & SIGNAL_GROUP_EXIT) | 1759 | if (signr == 0) |
1761 | continue; | 1760 | continue; |
1762 | 1761 | ||
1763 | current->exit_code = 0; | 1762 | current->exit_code = 0; |