[kernel] r22228 - in dists/wheezy/linux/debian/patches: . debian

[Ben Hutchings]

Author: benh
Date: Sat Dec 27 15:25:56 2014
New Revision: 22228

Log:
Fix ABI changes introduced by 3.2.64

Added:
   dists/wheezy/linux/debian/patches/debian/ceph-avoid-abi-change-in-3.2.64.patch
   dists/wheezy/linux/debian/patches/debian/regulatory-avoid-abi-change-in-3.2.64.patch
Modified:
   dists/wheezy/linux/debian/patches/series

Added: dists/wheezy/linux/debian/patches/debian/ceph-avoid-abi-change-in-3.2.64.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/debian/ceph-avoid-abi-change-in-3.2.64.patch	Sat Dec 27 15:25:56 2014	(r22228)
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 13 Nov 2014 21:50:47 +0000
+Subject: ceph: Avoid ABI change in 3.2.64
+Forwarded: not-needed
+
+ceph_msg::front_max was renamed to ceph_msg::front_alloc_len, but has
+the same purpose.  Hide this from genksyms.
+
+--- a/include/linux/ceph/messenger.h
++++ b/include/linux/ceph/messenger.h
+@@ -92,7 +92,11 @@ struct ceph_msg {
+ 	bool front_is_vmalloc;
+ 	bool more_to_follow;
+ 	bool needs_out_seq;
++#ifdef __GENKSYMS__
++	int front_max;			/* renamed */
++#else
+ 	int front_alloc_len;
++#endif
+ 	unsigned long ack_stamp;        /* tx: when we were acked */
+ 
+ 	struct ceph_msgpool *pool;

Added: dists/wheezy/linux/debian/patches/debian/regulatory-avoid-abi-change-in-3.2.64.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/debian/regulatory-avoid-abi-change-in-3.2.64.patch	Sat Dec 27 15:25:56 2014	(r22228)
@@ -0,0 +1,26 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 13 Nov 2014 20:42:12 +0000
+Subject: regulatory: Avoid ABI change in 3.2.64
+Forwarded: not-needed
+
+ieee80211_regdomain::alpha2 grew from 2 to 3 bytes, to allow for a
+null terminator.  Thankfully the adjacent members both have 32-bit
+alignment (on all release architectures) so this only takes 1 of
+2 padding bytes and we can hide it from genksyms.
+
+--- a/include/net/regulatory.h
++++ b/include/net/regulatory.h
+@@ -92,7 +92,13 @@ struct ieee80211_reg_rule {
+ 
+ struct ieee80211_regdomain {
+ 	u32 n_reg_rules;
++#ifdef __GENKSYMS__
++	char alpha2[2];
++	/* 2 bytes padding for alignment */
++#else
+ 	char alpha2[3];
++	/* 1 byte padding for alignment */
++#endif
+ 	struct ieee80211_reg_rule reg_rules[];
+ };
+ 

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Wed Dec 24 16:54:34 2014	(r22227)
+++ dists/wheezy/linux/debian/patches/series	Sat Dec 27 15:25:56 2014	(r22228)
@@ -1136,3 +1136,5 @@
 bugfix/all/drivers-net-disable-ufo-through-virtio.patch
 bugfix/all/drivers-net-ipv6-select-ipv6-fragment-idents-for-vir.patch
 debian/drivers-net-avoid-abi-change-for-ufo-ipv6-fix.patch
+debian/regulatory-avoid-abi-change-in-3.2.64.patch
+debian/ceph-avoid-abi-change-in-3.2.64.patch