diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
| commit | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (patch) | |
| tree | 73162355b58283a2531f13fbbf663809f95c1483 /kernel/signal.c | |
| parent | 79fa1b677be3a985cc66b9218a4dd09818f1051b (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 5ccaac505e8d..b14f895027c3 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); |