diff --git a/[refs] b/[refs] index 44e4eb94daf0..2a7b7cae5548 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c06511d12d720b23c8dffff23004f0a888698f20 +refs/heads/master: e57a5059846e55d82b86d96dde40e988598601b3 diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c index 0eeb7e66722c..4e0f0ec003f7 100644 --- a/trunk/kernel/ptrace.c +++ b/trunk/kernel/ptrace.c @@ -56,10 +56,6 @@ void ptrace_untrace(task_t *child) signal_wake_up(child, 1); } } - if (child->signal->flags & SIGNAL_GROUP_EXIT) { - sigaddset(&child->pending.signal, SIGKILL); - signal_wake_up(child, 1); - } spin_unlock(&child->sighand->siglock); } @@ -81,7 +77,8 @@ void __ptrace_unlink(task_t *child) add_parent(child); } - ptrace_untrace(child); + if (child->state == TASK_TRACED) + ptrace_untrace(child); } /* diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index b14f895027c3..e5f8aea78ffe 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -1754,9 +1754,9 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, /* 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;