diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-17 15:35:18 +0100 |
| commit | 94171db1d2f23c22b6050d210b72db3bb2f0b81e (patch) | |
| tree | 2318d487807e9f7393fcd46ef0090a27b4ad7981 /kernel/signal.c | |
| parent | d96fb997c6174f98a2a0a98200f99ac13b053bd6 (diff) | |
| parent | c19f7a9e1ac45b57375d51f033b02deca50f4d3f (diff) | |
| download | kernel_goldelico_gta04-94171db1d2f23c22b6050d210b72db3bb2f0b81e.zip kernel_goldelico_gta04-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.gz kernel_goldelico_gta04-94171db1d2f23c22b6050d210b72db3bb2f0b81e.tar.bz2 | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 b14f895..e5f8aea 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1754,9 +1754,9 @@ relock: /* Let the debugger run. */ ptrace_stop(signr, signr, info); - /* We're back. Did the debugger cancel the sig or group_exit? */ + /* We're back. Did the debugger cancel the sig? */ signr = current->exit_code; - if (signr == 0 || current->signal->flags & SIGNAL_GROUP_EXIT) + if (signr == 0) continue; current->exit_code = 0; |