sparc64: Fix UP bootup regression.
Commit b696fdc259
("sparc64: Defer
cpu_data() setup until end of per-cpu data initialization.") broke
bootup for UP builds because the cpu_data() initialization only
occurs in setup_per_cpu_areas() which is never compiled in nor
called in UP builds.
Fix this up by calling the setups directly from init_64.c when
non-SMP.
Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Tested-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
aaa7e2f74f
commit
b99c6ebe8f
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue