Patch "powerpc: Fix default_machine_crash_shutdown #ifdef botch" 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: Fix default_machine_crash_shutdown #ifdef botch

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-fix-default_machine_crash_shutdown-ifdef-botch.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:40 2011
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Wed, 6 Apr 2011 18:34:48 +0530
Subject: powerpc: Fix default_machine_crash_shutdown #ifdef botch
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: <20110406130448.GL28246@linux.vnet.ibm.com>
Content-Disposition: inline

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

powerpc: Fix default_machine_crash_shutdown #ifdef botch

Commit: c2be05481f6125254c45b78f334d4dd09c701c82 upstream

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.

Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 arch/powerpc/kernel/crash.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -447,7 +447,7 @@ 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
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
 	crash_kexec_wait_realmode(crashing_cpu);
 #endif
 	if (ppc_md.kexec_cpu_down)


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