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

[Dann Frazier]

Author: dannf
Date: Tue May  3 05:58:08 2011
New Revision: 17286

Log:
[powerpc] Apply kexec fix from 2.6.32.34, avoiding ABI change

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/powerpc-kexec-Avoid-ABI-change-in-2.6.32.34.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/34

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon May  2 20:31:54 2011	(r17285)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue May  3 05:58:08 2011	(r17286)
@@ -55,6 +55,7 @@
       in the 'video' parameter on the kernel command line
   * atl1c: Fix duplication of packet headers when using sendfile
     (Closes: #623059)
+  * [powerpc] Apply kexec fix from 2.6.32.34, avoiding ABI change
 
   [ dann frazier ]
   * Add longterm release 2.6.32.39, including:

Added: dists/squeeze/linux-2.6/debian/patches/debian/powerpc-kexec-Avoid-ABI-change-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/powerpc-kexec-Avoid-ABI-change-in-2.6.32.34.patch	Tue May  3 05:58:08 2011	(r17286)
@@ -0,0 +1,14 @@
+diff -urpN a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
+--- a/arch/powerpc/include/asm/paca.h	2011-05-02 12:47:03.828725140 -0600
++++ b/arch/powerpc/include/asm/paca.h	2011-05-02 12:49:26.173733680 -0600
+@@ -76,7 +76,10 @@ struct paca_struct {
+ 	s16 hw_cpu_id;			/* Physical processor number */
+ 	u8 cpu_start;			/* At startup, processor spins until */
+ 					/* this becomes non-zero. */
++#ifndef __GENKSYMS__
++/* There was previously a hole here, so this doesn't break ABI */
+ 	u8 kexec_state;         /* set when kexec down has irqs off */
++#endif
+ #ifdef CONFIG_PPC_STD_MMU_64
+ 	struct slb_shadow *slb_shadow_ptr;
+ 

Modified: dists/squeeze/linux-2.6/debian/patches/series/34
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/34	Mon May  2 20:31:54 2011	(r17285)
+++ dists/squeeze/linux-2.6/debian/patches/series/34	Tue May  3 05:58:08 2011	(r17286)
@@ -39,3 +39,5 @@
 + bugfix/all/atl1c-duplicate-atl1c_get_tpd.patch
 + bugfix/all/stable/2.6.32.39.patch
 + debian/revert-amd-deep-c-changes-in-2.6.32.39.patch
+- debian/revert-powerpc-kexec-ABI-change-in-2.6.32.34.patch
++ debian/powerpc-kexec-Avoid-ABI-change-in-2.6.32.34.patch