2 files changed, 10 insertions, 12 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 3d759c98fb11..9dd5f1336da2 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -953,10 +953,8 @@ fastcall NORET_TYPE void do_exit(long code)
         if (tsk->splice_pipe)
                 __free_pipe_info(tsk->splice_pipe);
 
-        /* PF_DEAD causes final put_task_struct after we schedule. */
         preempt_disable();
-        BUG_ON(tsk->flags & PF_DEAD);
-        tsk->flags |= PF_DEAD;
+        /* causes final put_task_struct in finish_task_switch(). */
         tsk->state = EXIT_DEAD;
 
         schedule();
@@ -972,7 +970,7 @@ NORET_TYPE void complete_and_exit(struct completion *comp, long code)
 {
         if (comp)
                 complete(comp);
-        
+
         do_exit(code);
 }
 
diff --git a/kernel/sched.c b/kernel/sched.c
index e1646b044b69..a9405d7cc6ab 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1755,27 +1755,27 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
         __releases(rq->lock)
 {
         struct mm_struct *mm = rq->prev_mm;
-        unsigned long prev_task_flags;
+        long prev_state;
 
         rq->prev_mm = NULL;
 
         /*
          * A task struct has one reference for the use as "current".
-         * If a task dies, then it sets EXIT_ZOMBIE in tsk->exit_state and
-         * calls schedule one last time. The schedule call will never return,
-         * and the scheduled task must drop that reference.
-         * The test for EXIT_ZOMBIE must occur while the runqueue locks are
+         * If a task dies, then it sets EXIT_DEAD in tsk->state and calls
+         * schedule one last time. The schedule call will never return, and
+         * the scheduled task must drop that reference.
+         * The test for EXIT_DEAD must occur while the runqueue locks are
          * still held, otherwise prev could be scheduled on another cpu, die
          * there before we look at prev->state, and then the reference would
          * be dropped twice.
          *              Manfred Spraul <manfred@colorfullife.com>
          */
-        prev_task_flags = prev->flags;
+        prev_state = prev->state;
         finish_arch_switch(prev);
         finish_lock_switch(rq, prev);
         if (mm)
                 mmdrop(mm);
-        if (unlikely(prev_task_flags & PF_DEAD)) {
+        if (unlikely(prev_state == EXIT_DEAD)) {
                 /*
                  * Remove function-return probe instances associated with this
                  * task and put them back on the free list.
@@ -5153,7 +5153,7 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p)
         BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD);
 
         /* Cannot have done final schedule yet: would have vanished. */
-        BUG_ON(p->flags & PF_DEAD);
+        BUG_ON(p->state == EXIT_DEAD);
 
         get_task_struct(p);