Re: Stable update of linux-2.6

[Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>]

* dann frazier <dannf@dannf.org> [2011-04-02 11:23:03]:

> 2.6.32.36 also fails to build on powerpc/SMP:
> 
>   CC      arch/powerpc/kernel/crash.o
> arch/powerpc/kernel/crash.c: In function 'crash_kexec_wait_realmode':
> arch/powerpc/kernel/crash.c:176: error: 'paca' undeclared (first use in this function)
> arch/powerpc/kernel/crash.c:176: error: (Each undeclared identifier is reported only once
> arch/powerpc/kernel/crash.c:176: error: for each function it appears in.)
> make[1]: *** [arch/powerpc/kernel/crash.o] Error 1
> make: *** [arch/powerpc/kernel] Error 2

Hi Dann,

	Can you please try the following patch, which adds the changes
introduced by Kumar Gala to the commit b3df895aeb to my previous patch.

    powerpc: Fix default_machine_crash_shutdown #ifdef build failure

    Introducing #ifdef to fix the build failure caused by
    crash_kexec_wait_realmode(), with powerpc build with !SMP.

    Reported-by: Ben Hutchings <ben@decadent.org.uk>
    Reported-by: dann frazier <dannf@dannf.org>
    Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    cc: Michael Neuling <mikey@neuling.org>
	cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    cc: Anton Blanchard <anton@samba.org>
    cc: Kumar Gala <galak@kernel.crashing.org>
--
 arch/powerpc/kernel/crash.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index fe02e71..175d1a7 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu)
 }

 /* wait for all the CPUs to hit real mode but timeout if they don't come in */
+#ifdef CONFIG_PPC_STD_MMU_64
 static void crash_kexec_wait_realmode(int cpu)
 {
	unsigned int msecs;
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu)
	}
	mb();
 }
+#endif

 /*
  * This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
	crash_kexec_prepare_cpus(crashing_cpu);
	cpu_set(crashing_cpu, cpus_in_crash);
	crash_kexec_stop_spus();
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
	crash_kexec_wait_realmode(crashing_cpu);
+#endif
	if (ppc_md.kexec_cpu_down)
		ppc_md.kexec_cpu_down(1, 0);
 }
			Kamalesh