From patchwork Thu Jun 18 08:44:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 2.6.31-rc1: sparc cannot boot Date: Wed, 17 Jun 2009 22:44:59 -0000 From: David Miller X-Patchwork-Id: 28849 Message-Id: <20090618.014459.182446746.davem@davemloft.net> To: a.beregalov@gmail.com Cc: sparclinux@vger.kernel.org From: Alexander Beregalov Date: Wed, 17 Jun 2009 19:00:18 +0400 > Config is attached. Aha, the key is non-SMP build. > b696fdc259f0d94348a9327bed352fac44d4883d is first bad commit > sparc64: Defer cpu_data() setup until end of per-cpu data initialization. > > Does it make sense to you? I see the problem, please try this patch: 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 Signed-off-by: David S. Miller --- 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 ca92e2f..ed6be6b 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