2 files changed, 1 insertions, 3 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 4a280856acd2..3d759c98fb11 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -957,6 +957,7 @@ fastcall NORET_TYPE void do_exit(long code)
         preempt_disable();
         BUG_ON(tsk->flags & PF_DEAD);
         tsk->flags |= PF_DEAD;
+        tsk->state = EXIT_DEAD;
 
         schedule();
         BUG();
diff --git a/kernel/sched.c b/kernel/sched.c
index 155a33da7aa7..e1646b044b69 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3348,9 +3348,6 @@ need_resched_nonpreemptible:
 
         spin_lock_irq(&rq->lock);
 
-        if (unlikely(prev->flags & PF_DEAD))
-                prev->state = EXIT_DEAD;
-
         switch_count = &prev->nivcsw;
         if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
                 switch_count = &prev->nvcsw;