Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:42:01 +0000 (17:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 00:42:01 +0000 (17:42 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
  sparc64: Fix UP bootup regression.

arch/sparc/mm/init_64.c

index ca92e2f54e4d5bd5f3e2f663ce2056eecb853c7e..ed6be6ba2f4e9f7859c3e34b27fdc8e5ccc6f5ab 100644 (file)
@@ -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