1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index a75b6a7f458a..5b4a5dcce8f8 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -720,6 +720,7 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
         if (group_dead)
                 kill_orphaned_pgrp(tsk->group_leader, NULL);
 
+        tsk->exit_state = EXIT_ZOMBIE;
         if (unlikely(tsk->ptrace)) {
                 int sig = thread_group_leader(tsk) &&
                                 thread_group_empty(tsk) &&
@@ -733,9 +734,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
                 autoreap = true;
         }
 
-        tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
-        if (tsk->exit_state == EXIT_DEAD)
+        if (autoreap) {
+                tsk->exit_state = EXIT_DEAD;
                 list_add(&tsk->ptrace_entry, &dead);
+        }
 
         /* mt-exec, de_thread() is waiting for group leader */
         if (unlikely(tsk->signal->notify_count < 0))