commit b696fdc259f0d94348a9327bed352fac44d4883d
author David S. Miller <davem@davemloft.net> Tue May 26 22:37:25 2009 -0700
committer David S. Miller <davem@davemloft.net> Tue Jun 16 04:56:22 2009 -0700
tree 8fed30584b6fcd5c6cb64f5091add9fd385394a1
parent a2094502dce23e9ace04d49702aa7a4d5996df55

sparc64: Defer cpu_data() setup until end of per-cpu data initialization.

Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc/kernel/smp_64.c

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index b20f253..045fbb5 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1399,4 +1399,8 @@
 
 	/* Setup %g5 for the boot cpu.  */
 	__local_per_cpu_offset = __per_cpu_offset(smp_processor_id());
+
+	of_fill_in_cpu_data();
+	if (tlb_type == hypervisor)
+		mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
 }