Re: Stable update of linux-2.6

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

* Greg KH <greg@kroah.com> [2011-04-05 08:47:37]:

> On Tue, Apr 05, 2011 at 08:41:50PM +0530, Kamalesh Babulal wrote:
> > * Greg KH <greg@kroah.com> [2011-04-05 07:08:30]:
> > 
> > > On Tue, Apr 05, 2011 at 04:21:33PM +0530, Kamalesh Babulal wrote:
> > > > * dann frazier <dannf@dannf.org> [2011-04-04 15:57:55]:
> > > > 
> > > > > On Sun, Apr 03, 2011 at 01:21:03PM +0530, Kamalesh Babulal wrote:
> > > > > > * dann frazier <dannf@dannf.org> [2011-04-02 11:23:03]:
> > > > > > 
[...]
> > > > Hi Greg,
> > > > 
> > > > 	Can you please pick up the patch for 2.6.32-stable, resending the
> > > > patch with some checkpatch warnings fixed.
> > > > 
> > > >     powerpc: Fix default_machine_crash_shutdown #ifdef build failure
> > > 
> > > Is this patch upstream in Linus's tree?  If so, what is the git commit
> > > id?  If not, why isn't it needed there?
> > [...]
> > 
> > the #ifdef CONFIG_PPC_STD_MMU_64 bits are taken from upstream commit
> > b3df895aebe09 and the build failure incase of SMP=n is from the
> > upstream commit c2be05481f61.
> > 
> > Should I resend the patch in rebase format including both the commits
> > id and message.
> 
> Yes, please do.
>

Hi Greg,

	Resending the patch with commit id and message included. Please let
me know, incase the patch needs any other changes to be made.

    powerpc: Fix default_machine_crash_shutdown #ifdef build failure

    This patch introduces #ifdef bits from below commits, to fix the
    build failure on powerpc caused by crash_kexec_wait_realmode()
    when compiled with !SMP.

    Commit: c2be05481f6125254c45b78f334d4dd09c701c82 upstream

    powerpc: Fix default_machine_crash_shutdown #ifdef botch

    crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64
    and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP.
    Fix the conditional compilation around the invocation.

    Commit: b3df895aebe091b1657a42a8c859bd49fc96646b upstream

    powerpc/kexec: Add support for FSL-BookE

    This adds support kexec on FSL-BookE where the MMU can not be simply
    switched off. The code borrows the initial MMU-setup code to create the
    identical mapping mapping. The only difference to the original boot code
    is the size of the mapping(s) and the executeable address.
    The kexec code maps the first 2 GiB of memory in 256 MiB steps. This
    should work also on e500v1 boxes.
    SMP support is still not available.

    (Kumar: Added minor change to build to ifdef CONFIG_PPC_STD_MMU_64 some
    code that was PPC64 specific)

    Reported-by: Ben Hutchings <ben@decadent.org.uk>
    Reported-and-tested-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..5009198 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);
 }

thanks,
Kamalesh