1 files changed, 9 insertions, 1 deletions

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 57162af53dc9..a01194e583ff 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -86,6 +86,12 @@ int __cpuinit __cpu_up(unsigned int cpu)
                         return PTR_ERR(idle);
                 }
                 ci->idle = idle;
+        } else {
+                /*
+                 * Since this idle thread is being re-used, call
+                 * init_idle() to reinitialize the thread structure.
+                 */
+                init_idle(idle, cpu);
         }
 
         /*
@@ -99,6 +105,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
         *pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) |
                      PMD_TYPE_SECT | PMD_SECT_AP_WRITE);
         flush_pmd_entry(pmd);
+        outer_clean_range(__pa(pmd), __pa(pmd + 1));
 
         /*
          * We need to tell the secondary core where to find
@@ -106,7 +113,8 @@ int __cpuinit __cpu_up(unsigned int cpu)
          */
         secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;
         secondary_data.pgdir = virt_to_phys(pgd);
-        wmb();
+        __cpuc_flush_dcache_area(&secondary_data, sizeof(secondary_data));
+        outer_clean_range(__pa(&secondary_data), __pa(&secondary_data + 1));
 
         /*
          * Now bring the CPU into our world.