summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r--arch/sparc/mm/init_64.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 87fea94e5125..785f0a24fcbf 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1799,20 +1799,16 @@ void __init paging_init(void)
if (tlb_type == hypervisor)
sun4v_ktsb_register();
- /* We must setup the per-cpu areas before we pull in the
- * PROM and the MDESC. The code there fills in cpu and
- * other information into per-cpu data structures.
- */
- real_setup_per_cpu_areas();
-
prom_build_devicetree();
- of_fill_in_cpu_data();
+ of_populate_present_mask();
if (tlb_type == hypervisor) {
sun4v_mdesc_init();
- mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
+ mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
}
+ real_setup_per_cpu_areas();
+
/* Once the OF device tree and MDESC have been setup, we know
* the list of possible cpus. Therefore we can allocate the
* IRQ stacks.
OpenPOWER on IntegriCloud