Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 4 insertions, 10 deletions

diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 160db1003cfb..002cc612deef 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -69,6 +69,7 @@ asmlinkage void __cpuinit start_secondary(void)
         unsigned int cpu;
         struct mm_struct *mm = &init_mm;
 
+        enable_mmu();
         atomic_inc(&mm->mm_count);
         atomic_inc(&mm->mm_users);
         current->active_mm = mm;
@@ -122,7 +123,9 @@ int __cpuinit __cpu_up(unsigned int cpu)
         stack_start.bss_start = 0; /* don't clear bss for secondary cpus */
         stack_start.start_kernel_fn = start_secondary;
 
-        flush_cache_all();
+        flush_icache_range((unsigned long)&stack_start,
+                           (unsigned long)&stack_start + sizeof(stack_start));
+        wmb();
 
         plat_start_cpu(cpu, (unsigned long)_stext);
 
@@ -159,15 +162,6 @@ void smp_send_reschedule(int cpu)
         plat_send_ipi(cpu, SMP_MSG_RESCHEDULE);
 }
 
-static void stop_this_cpu(void *unused)
-{
-        cpu_clear(smp_processor_id(), cpu_online_map);
-        local_irq_disable();
-
-        for (;;)
-                cpu_relax();
-}
-
 void smp_send_stop(void)
 {
         smp_call_function(stop_this_cpu, 0, 0);