[SPARC64]: Move setting of current_thread_info()->cpu to smp_prepare_boot_cpu()

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index aa20690a8d3fff43291bf926dced6eec0177af10..6b5ae9dbaa3926caab46ffafe3a0da6e670ccda0 100644 (file)
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1261,6 +1261,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
 void __devinit smp_prepare_boot_cpu(void)
 {
+       current_thread_info()->cpu = hard_smp_processor_id();
        cpu_set(smp_processor_id(), cpu_online_map);
        cpu_set(smp_processor_id(), phys_cpu_present_map);
 }

diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 88dd0693f5e9512050319155ef5487c3879bb953..b4f47a5030b3c4b42462926fa64a4f10c05bbc7c 100644 (file)
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -2043,8 +2043,4 @@ void __init trap_init(void)
         */
        atomic_inc(&init_mm.mm_count);
        current->active_mm = &init_mm;
-
-#ifdef CONFIG_SMP
-       current_thread_info()->cpu = hard_smp_processor_id();
-#endif
 }