diff --git a/[refs] b/[refs] index facd80184403..fc2bea6279eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb24c679a51b1a9b726b901330649e3861814ac0 +refs/heads/master: 95a3540da9c81a5987be810e1d9a83640a366bd5 diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c index f5a9fa5aafa1..296e8105863a 100644 --- a/trunk/kernel/ptrace.c +++ b/trunk/kernel/ptrace.c @@ -301,11 +301,7 @@ 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);