1 files changed, 5 insertions, 2 deletions

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 2da087926ebe..0978282d5fc2 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -31,6 +31,7 @@
 #include <linux/irq_work.h>
 
 #include <linux/atomic.h>
+#include <asm/bugs.h>
 #include <asm/smp.h>
 #include <asm/cacheflush.h>
 #include <asm/cpu.h>
@@ -236,8 +237,6 @@ int __cpu_disable(void)
         flush_cache_louis();
         local_flush_tlb_all();
 
-        clear_tasks_mm_cpumask(cpu);
-
         return 0;
 }
 
@@ -255,6 +254,7 @@ void __cpu_die(unsigned int cpu)
         }
         pr_debug("CPU%u: shutdown\n", cpu);
 
+        clear_tasks_mm_cpumask(cpu);
         /*
          * platform_cpu_kill() is generally expected to do the powering off
          * and/or cutting of clocks to the dying CPU.  Optionally, this may
@@ -405,6 +405,9 @@ asmlinkage void secondary_start_kernel(void)
          * before we continue - which happens after __cpu_up returns.
          */
         set_cpu_online(cpu, true);
+
+        check_other_bugs();
+
         complete(&cpu_running);
 
         local_irq_enable();