From b696fdc259f0d94348a9327bed352fac44d4883d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 26 May 2009 22:37:25 -0700 Subject: sparc64: Defer cpu_data() setup until end of per-cpu data initialization. Signed-off-by: David S. Miller --- arch/sparc/mm/init_64.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'arch/sparc/mm/init_64.c') diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 87fea94e512..785f0a24fcb 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. -- cgit v1.2.3