diff --git a/[refs] b/[refs] index 34819c09d215..2d1527093168 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08f67461c609ad96bf26732b590569e02e322019 +refs/heads/master: edaba2c5334492f82d39ec35637c6dea5176a977 diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c index 0692ab5a0d67..42c317874cfa 100644 --- a/trunk/kernel/ptrace.c +++ b/trunk/kernel/ptrace.c @@ -304,6 +304,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);