diff options
-rw-r--r-- | fs/exec.c | 2 | ||||
-rw-r--r-- | kernel/exit.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -798,7 +798,7 @@ static int de_thread(struct task_struct *tsk) | |||
798 | if (!thread_group_leader(tsk)) { | 798 | if (!thread_group_leader(tsk)) { |
799 | leader = tsk->group_leader; | 799 | leader = tsk->group_leader; |
800 | 800 | ||
801 | sig->notify_count = -1; | 801 | sig->notify_count = -1; /* for exit_notify() */ |
802 | for (;;) { | 802 | for (;;) { |
803 | write_lock_irq(&tasklist_lock); | 803 | write_lock_irq(&tasklist_lock); |
804 | if (likely(leader->exit_state)) | 804 | if (likely(leader->exit_state)) |
diff --git a/kernel/exit.c b/kernel/exit.c index 413c81ec858e..879ed6e1c883 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -877,6 +877,7 @@ static void exit_notify(struct task_struct *tsk, int group_dead) | |||
877 | state = EXIT_DEAD; | 877 | state = EXIT_DEAD; |
878 | tsk->exit_state = state; | 878 | tsk->exit_state = state; |
879 | 879 | ||
880 | /* mt-exec, de_thread() is waiting for us */ | ||
880 | if (thread_group_leader(tsk) && | 881 | if (thread_group_leader(tsk) && |
881 | tsk->signal->notify_count < 0 && | 882 | tsk->signal->notify_count < 0 && |
882 | tsk->signal->group_exit_task) | 883 | tsk->signal->group_exit_task) |