diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-18 01:44:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-18 23:50:41 -0700 |
| commit | b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c (patch) | |
| tree | b627f81db133b9463ac206e4e8327ee530ba0b81 /arch/sparc | |
| parent | aaa7e2f74f11b5f7e30483807b896d7b3369586f (diff) | |
| download | linux-stable-b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c.tar.gz linux-stable-b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c.tar.bz2 linux-stable-b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c.zip | |
sparc64: Fix UP bootup regression.
Commit b696fdc259f0d94348a9327bed352fac44d4883d ("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>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index ca92e2f54e4d..ed6be6ba2f4e 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 |