[kernel] r17180 - in dists/squeeze/linux-2.6/debian: . patches/debian patches/series

[Dann Frazier]

Author: dannf
Date: Sat Apr  2 17:52:02 2011
New Revision: 17180

Log:
[powerpc] Revert kdump fix from 2.6.32.34 (FTBFS)

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/revert-powerpc-kdump-fix-in-2.6.32.34.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	Sat Apr  2 17:04:50 2011	(r17179)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Apr  2 17:52:02 2011	(r17180)
@@ -6,8 +6,6 @@
     - 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)
   * [x86] Enable VMWARE_PVSCSI as module (Really closes: #600957)
   * via-ircc: Fix device list management and DMA buffer allocation
     (Closes: #619450)
@@ -16,6 +14,7 @@
   * xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
     This fixes a panic caused by a regression introduced by the fix
     for CVE-2011-0711.
+  * [powerpc] Revert kdump fix from 2.6.32.34 (FTBFS)
 
  -- dann frazier <dannf at debian.org>  Thu, 31 Mar 2011 18:43:14 -0600
 

Added: dists/squeeze/linux-2.6/debian/patches/debian/revert-powerpc-kdump-fix-in-2.6.32.34.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/revert-powerpc-kdump-fix-in-2.6.32.34.patch	Sat Apr  2 17:52:02 2011	(r17180)
@@ -0,0 +1,44 @@
+diff -urpN linux-2.6.32.36.orig/arch/powerpc/kernel/crash.c linux-2.6.32.36/arch/powerpc/kernel/crash.c
+--- linux-2.6.32.36.orig/arch/powerpc/kernel/crash.c	2011-03-27 12:31:47.000000000 -0600
++++ linux-2.6.32.36/arch/powerpc/kernel/crash.c	2011-04-02 11:23:31.000000000 -0600
+@@ -162,32 +162,6 @@ static void crash_kexec_prepare_cpus(int
+ 	/* Leave the IPI callback set */
+ }
+ 
+-/* wait for all the CPUs to hit real mode but timeout if they don't come in */
+-static void crash_kexec_wait_realmode(int cpu)
+-{
+-	unsigned int msecs;
+-	int i;
+-
+-	msecs = 10000;
+-	for (i=0; i < NR_CPUS && msecs > 0; i++) {
+-		if (i == cpu)
+-			continue;
+-
+-		while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
+-			barrier();
+-			if (!cpu_possible(i)) {
+-				break;
+-			}
+-			if (!cpu_online(i)) {
+-				break;
+-			}
+-			msecs--;
+-			mdelay(1);
+-		}
+-	}
+-	mb();
+-}
+-
+ /*
+  * This function will be called by secondary cpus or by kexec cpu
+  * if soft-reset is activated to stop some CPUs.
+@@ -445,7 +419,6 @@ void default_machine_crash_shutdown(stru
+ 	crash_kexec_prepare_cpus(crashing_cpu);
+ 	cpu_set(crashing_cpu, cpus_in_crash);
+ 	crash_kexec_stop_spus();
+-	crash_kexec_wait_realmode(crashing_cpu);
+ 	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	Sat Apr  2 17:04:50 2011	(r17179)
+++ dists/squeeze/linux-2.6/debian/patches/series/33	Sat Apr  2 17:52:02 2011	(r17180)
@@ -1,6 +1,6 @@
 + 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
 + bugfix/all/via-ircc-Use-pci_-get-set-_drvdata-instead-of-static.patch
 + bugfix/all/via-ircc-Pass-PCI-device-pointer-to-dma_-alloc-free-.patch
 + bugfix/all/xfs-zero-proper-structure-size-for-geometry-calls.patch
++ debian/revert-powerpc-kdump-fix-in-2.6.32.34.patch