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

[Ben Hutchings]

Author: benh
Date: Fri Nov  2 15:00:37 2012
New Revision: 19479

Log:
header: fix broken headers for user space (Closes: #692133)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/header-fix-broken-headers-for-user-space.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/47

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Nov  2 05:34:58 2012	(r19478)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Nov  2 15:00:37 2012	(r19479)
@@ -4,6 +4,7 @@
   * [x86] ALSA: hda_intel: Add device/class IDs for Intel Patsburg,
     Vortex86MX, VMware, Intel Panther Point and other Intel chips
     (Closes: #689928)
+  * header: fix broken headers for user space (Closes: #692133)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 08 Oct 2012 00:26:11 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/header-fix-broken-headers-for-user-space.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/header-fix-broken-headers-for-user-space.patch	Fri Nov  2 15:00:37 2012	(r19479)
@@ -0,0 +1,39 @@
+From: Changli Gao <xiaosuo at gmail.com>
+Date: Sun, 22 Aug 2010 17:25:05 +0000
+Subject: header: fix broken headers for user space
+Bug-Debian: http://bugs.debian.org/692133
+
+commit 09cd2b99c6cdd1e14e84c1febca2fb91e9f4e5ba upstream.
+
+__packed is only defined in kernel space, so we should use
+__attribute__((packed)) for the code shared between kernel and user space.
+
+Two __attribute() annotations are replaced with __attribute__() too.
+
+Signed-off-by: Changli Gao <xiaosuo at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+[bwh: Backported to 2.6.32: most changes were unneeded, as the headers had
+ not yet been wrongly converted to use __packed]
+---
+--- a/include/linux/if_pppox.h
++++ b/include/linux/if_pppox.h
+@@ -92,7 +92,7 @@ struct pppoe_tag {
+ 	__be16 tag_type;
+ 	__be16 tag_len;
+ 	char tag_data[0];
+-} __attribute ((packed));
++} __attribute__ ((packed));
+ 
+ /* Tag identifiers */
+ #define PTT_EOL		__cpu_to_be16(0x0000)
+--- a/include/linux/rfkill.h
++++ b/include/linux/rfkill.h
+@@ -78,7 +78,7 @@ struct rfkill_event {
+ 	__u8  type;
+ 	__u8  op;
+ 	__u8  soft, hard;
+-} __packed;
++} __attribute__((packed));
+ 
+ /*
+  * We are planning to be backward and forward compatible with changes

Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47	Fri Nov  2 05:34:58 2012	(r19478)
+++ dists/squeeze/linux-2.6/debian/patches/series/47	Fri Nov  2 15:00:37 2012	(r19479)
@@ -3,3 +3,4 @@
 + features/x86/ALSA-hda-add-Vortex86MX-PCI-ids.patch
 + features/x86/ALSA-hda-Add-support-for-VMware-controller.patch
 + features/x86/ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch
++ bugfix/all/header-fix-broken-headers-for-user-space.patch