aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 17:42:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 17:42:01 -0700
commitee37ba7a4212c7420f12e6a2ad8a3966649ede7a (patch)
treea9d3a5088bf7abcfba74c5ce61dd577292c838cd
parent773d7a09e1a1349a5319ac8665e9c612c6aa27d8 (diff)
parentb99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c (diff)
downloadlinux-ee37ba7a4212c7420f12e6a2ad8a3966649ede7a.tar.gz
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.
-rw-r--r--arch/sparc/mm/init_64.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index ca92e2f54e4..ed6be6ba2f4 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