Fix some ABI changes in 3.14.6

svn path=/dists/sid/linux/; revision=21439

debian/patches/debian/dma-avoid-abi-change-in-3.14.6.patch

@@ -0,0 +1,25 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 15 Jun 2014 21:44:43 +0100
+Subject: dmaengine: Avoid ABI change in 3.14.6
+Forwarded: not-needed
+
+dmaengine_unmap_data::map_cnt was added to the beginning of the
+structure.  Move it after bidi_cnt, where there was previously at
+least one byte of padding, and hide it from genksyms.
+
+--- a/include/linux/dmaengine.h
++++ b/include/linux/dmaengine.h
+@@ -433,10 +433,12 @@ typedef bool (*dma_filter_fn)(struct dma
+ typedef void (*dma_async_tx_callback)(void *dma_async_param);
+ 
+ struct dmaengine_unmap_data {
+-	u8 map_cnt;
+ 	u8 to_cnt;
+ 	u8 from_cnt;
+ 	u8 bidi_cnt;
++#ifndef __GENKSYMS__
++	u8 map_cnt;
++#endif
+ 	struct device *dev;
+ 	struct kref kref;
+ 	size_t len;

debian/patches/debian/drivers-base-platform-avoid-abi-change-in-3.14.6.patch

@@ -0,0 +1,19 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 15 Jun 2014 21:41:43 +0100
+Subject: drivers/base/platform: Avoid ABI change in 3.14.6
+Forwarded: not-needed
+
+Hide the new #include from genksyms.
+
+--- a/drivers/base/platform.c
++++ b/drivers/base/platform.c
+@@ -13,7 +13,9 @@
+ #include <linux/string.h>
+ #include <linux/platform_device.h>
+ #include <linux/of_device.h>
++#ifndef __GENKSYMS__
+ #include <linux/of_irq.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/dma-mapping.h>

debian/patches/series

@@ -91,3 +91,5 @@ bugfix/mips/MIPS-Fix-branch-emulation-of-branch-likely-instructi.patch
 bugfix/all/netfilter-ipv4-defrag-set-local_df-flag-on-defragmen.patch
 bugfix/mips/MIPS-asm-thread_info-Add-_TIF_SECCOMP-flag.patch
 bugfix/all/auditsc-audit_krule-mask-accesses-need-bounds-checki.patch
+debian/drivers-base-platform-avoid-abi-change-in-3.14.6.patch
+debian/dma-avoid-abi-change-in-3.14.6.patch