Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[safe/jmp/linux-2.6] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index e950805..2442d14 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -294,6 +294,8 @@ int ptrace_detach(struct task_struct *child, unsigned int data)
        if (child->ptrace) {
                child->exit_code = data;
                dead = __ptrace_detach(current, child);
+               if (!child->exit_state)
+                       wake_up_process(child);
        }
        write_unlock_irq(&tasklist_lock);