Patch "powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code" has been added to the 2.6.33-longterm tree

[<gregkh@suse.de>]

This is a note to let you know that I've just added the patch titled

    powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code

to the 2.6.33-longterm tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.33.git;a=summary

The filename of the patch is:
     powerpc-kexec-add-ifdef-config_ppc_std_mmu_64-to-ppc64-code.patch
and it can be found in the queue-2.6.33 subdirectory.

If you, or anyone else, feels it should not be added to the 2.6.33 longterm tree,
please let <stable@kernel.org> know about it.


>From kamalesh@linux.vnet.ibm.com  Mon Apr 11 15:53:13 2011
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Wed, 6 Apr 2011 18:31:45 +0530
Subject: powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
To: Greg KH <greg@kroah.com>
Cc: Ben Hutchings <ben@decadent.org.uk>, stable@kernel.org, Debian kernel maintainers <debian-kernel@lists.debian.org>, debian-release@lists.debian.org, "Adam D. Barratt" <adam@adam-barratt.org.uk>, paulmck@linux.vnet.ibm.com, mikey@neuling.org, benh@kernel.crashing.org, anton@samba.org, dann frazier <dannf@dannf.org>, galak@kernel.crashing.org
Message-ID: <20110406130145.GK28246@linux.vnet.ibm.com>
Content-Disposition: inline

From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>

powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code

This patch introduces PPC64 specific #ifdef bits from the upstream
commit: b3df895aebe091b1657a42a8c859bd49fc96646b.

Reported-and-tested-by: dann frazier <dannf@dannf.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 arch/powerpc/kernel/crash.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int
 }
 
 /* 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(in
 	}
 	mb();
 }
+#endif
 
 /*
  * This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(stru
 	crash_kexec_prepare_cpus(crashing_cpu);
 	cpu_set(crashing_cpu, cpus_in_crash);
 	crash_kexec_stop_spus();
+#ifdef CONFIG_PPC_STD_MMU_64
 	crash_kexec_wait_realmode(crashing_cpu);
+#endif
 	if (ppc_md.kexec_cpu_down)
 		ppc_md.kexec_cpu_down(1, 0);
 }


Patches currently in longterm-queue-2.6.33 which might be from kamalesh@linux.vnet.ibm.com are

/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/powerpc-fix-default_machine_crash_shutdown-ifdef-botch.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/powerpc-kexec-add-ifdef-config_ppc_std_mmu_64-to-ppc64-code.patch