1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 1972b161c61e..d46b4dae0ca0 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -408,8 +408,10 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
          *
          * Wait for the stop thread to go away.
          */
-        while (!idle_cpu(cpu))
+        while (!per_cpu(cpu_dead_idle, cpu))
                 cpu_relax();
+        smp_mb(); /* Read from cpu_dead_idle before __cpu_die(). */
+        per_cpu(cpu_dead_idle, cpu) = false;
 
         /* This actually kills the CPU. */
         __cpu_die(cpu);