diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /kernel/signal.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index b14f895027c3..e5f8aea78ffe 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1754,9 +1754,9 @@ relock: | |||
| 1754 | /* Let the debugger run. */ | 1754 | /* Let the debugger run. */ |
| 1755 | ptrace_stop(signr, signr, info); | 1755 | ptrace_stop(signr, signr, info); |
| 1756 | 1756 | ||
| 1757 | /* We're back. Did the debugger cancel the sig or group_exit? */ | 1757 | /* We're back. Did the debugger cancel the sig? */ |
| 1758 | signr = current->exit_code; | 1758 | signr = current->exit_code; |
| 1759 | if (signr == 0 || current->signal->flags & SIGNAL_GROUP_EXIT) | 1759 | if (signr == 0) |
| 1760 | continue; | 1760 | continue; |
| 1761 | 1761 | ||
| 1762 | current->exit_code = 0; | 1762 | current->exit_code = 0; |