Merge branch 'master' into next

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 27ac80298bfa..43a5a3b0be79 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -305,6 +305,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);