[kernel] r17160 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/powerpc patches/series

[Ben Hutchings]

Author: benh
Date: Wed Mar 30 12:40:22 2011
New Revision: 17160

Log:
[powerpc] Fix default_machine_crash_shutdown #ifdef botch (FTBFS)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/powerpc/powerpc-Fix-default_machine_crash_shutdown-not-SMP.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/33

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Mar 30 12:31:31 2011	(r17159)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Mar 30 12:40:22 2011	(r17160)
@@ -1,9 +1,14 @@
 linux-2.6 (2.6.32-33) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * Add drm changes from 2.6.32.28+drm33.13:
     - drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
     - drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.
 
+  [ Ben Hutchings ]
+  * [powerpc] Fix default_machine_crash_shutdown #ifdef botch
+    (FTBFS in non-SMP flavours in 2.6.32-32)
+
  -- maximilian attems <maks at debian.org>  Tue, 29 Mar 2011 18:56:55 +0200
 
 linux-2.6 (2.6.32-32) stable; urgency=high

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/powerpc/powerpc-Fix-default_machine_crash_shutdown-not-SMP.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/powerpc/powerpc-Fix-default_machine_crash_shutdown-not-SMP.patch	Wed Mar 30 12:40:22 2011	(r17160)
@@ -0,0 +1,33 @@
+Date: Wed, 30 Mar 2011 14:11:09 +0530
+From: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
+Subject: powerpc: Fix default_machine_crash_shutdown #ifdef botch
+
+commit c2be05481f6125254c45b78f334d4dd09c701c82 upstream.
+
+Introducing #ifdef to fix the build failure caused by
+crash_kexec_wait_realmode(), with powerpc build with !SMP.
+
+Reported-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
+cc: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
+cc: Michael Neuling <mikey at neuling.org>
+cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+cc: Anton Blanchard <anton at samba.org>
+---
+ arch/powerpc/kernel/crash.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
+index fe02e71..6ff7701 100644
+--- a/arch/powerpc/kernel/crash.c
++++ b/arch/powerpc/kernel/crash.c
+@@ -445,7 +445,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();
++#ifdef CONFIG_SMP
+	crash_kexec_wait_realmode(crashing_cpu);
++#endif
+	if (ppc_md.kexec_cpu_down)
+		ppc_md.kexec_cpu_down(1, 0);
+ }

Modified: dists/squeeze/linux-2.6/debian/patches/series/33
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/33	Wed Mar 30 12:31:31 2011	(r17159)
+++ dists/squeeze/linux-2.6/debian/patches/series/33	Wed Mar 30 12:40:22 2011	(r17160)
@@ -1,2 +1,3 @@
 + bugfix/all/drm-radeon-fall-back-to-GTT-if-bo-creation-validatio.patch
 + bugfix/all/drm-radeon-kms-Fix-retrying-ttm_bo_init-after-it-fai.patch
++ bugfix/powerpc/powerpc-Fix-default_machine_crash_shutdown-not-SMP.patch