diff --git a/[refs] b/[refs] index 850fee74aefc..c586e36d4842 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8292d633add73d40eda1d26089e2fc758944ac7c +refs/heads/master: 1f09f9749cdde4e69f95d62d96d2e03f50b3353c diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 98eec590ecbd..77c35efad88c 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -68,13 +68,12 @@ void release_task(struct task_struct * p) task_t *leader; struct dentry *proc_dentry; -repeat: +repeat: atomic_dec(&p->user->processes); spin_lock(&p->proc_lock); proc_dentry = proc_pid_unhash(p); write_lock_irq(&tasklist_lock); - if (unlikely(p->ptrace)) - __ptrace_unlink(p); + ptrace_unlink(p); BUG_ON(!list_empty(&p->ptrace_list) || !list_empty(&p->ptrace_children)); __exit_signal(p); /*