diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-26 22:37:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-16 04:56:22 -0700 |
| commit | b696fdc259f0d94348a9327bed352fac44d4883d (patch) | |
| tree | 8fed30584b6fcd5c6cb64f5091add9fd385394a1 /arch/sparc/mm | |
| parent | a2094502dce23e9ace04d49702aa7a4d5996df55 (diff) | |
| download | talos-obmc-linux-b696fdc259f0d94348a9327bed352fac44d4883d.tar.gz talos-obmc-linux-b696fdc259f0d94348a9327bed352fac44d4883d.zip | |
sparc64: Defer cpu_data() setup until end of per-cpu data initialization.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 12 |
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. |
