diff --git a/[refs] b/[refs] index 1dfd794fd3aa..1758a819a64e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74870172824a78640ec4f03058d9bd35dfa08618 +refs/heads/master: 2633f0e57b1127f4060d70bf460140dc9bb19386 diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 38ec40630149..75c647387639 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -918,8 +918,8 @@ static void exit_notify(struct task_struct *tsk, int group_dead) /* mt-exec, de_thread() is waiting for us */ if (thread_group_leader(tsk) && - tsk->signal->notify_count < 0 && - tsk->signal->group_exit_task) + tsk->signal->group_exit_task && + tsk->signal->notify_count < 0) wake_up_process(tsk->signal->group_exit_task); write_unlock_irq(&tasklist_lock);