Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
  sparc64: Fix UP bootup regression.

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index ca92e2f54e4d..ed6be6ba2f4e 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1796,10 +1796,16 @@ void __init paging_init(void)
 
         prom_build_devicetree();
         of_populate_present_mask();
+#ifndef CONFIG_SMP
+        of_fill_in_cpu_data();
+#endif
 
         if (tlb_type == hypervisor) {
                 sun4v_mdesc_init();
                 mdesc_populate_present_mask(cpu_all_mask);
+#ifndef CONFIG_SMP
+                mdesc_fill_in_cpu_data(cpu_all_mask);
+#endif
         }
 
         /* Once the OF device tree and MDESC have been setup, we know