From ee4980cb32cd4717c93598bbbeb84d3ac5167b07 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 17 Dec 2015 17:49:39 +0000
Subject: [PATCH] [armhf,sparc64] Force ZONE_DMA to be enabled, reversing ABI
 change in 4.3.3 (fixes FTBFS)

---
 debian/changelog                              |  7 ++++
 ...sparc64-force-zone_dma-to-be-enabled.patch | 40 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 debian/patches/debian/armhf-sparc64-force-zone_dma-to-be-enabled.patch

diff --git a/debian/changelog b/debian/changelog
index 0fd9ed66b..5a90043a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.3.3-2) UNRELEASED; urgency=medium
+
+  * [armhf,sparc64] Force ZONE_DMA to be enabled, reversing ABI change in
+    4.3.3 (fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Thu, 17 Dec 2015 17:49:56 +0000
+
 linux (4.3.3-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/patches/debian/armhf-sparc64-force-zone_dma-to-be-enabled.patch b/debian/patches/debian/armhf-sparc64-force-zone_dma-to-be-enabled.patch
new file mode 100644
index 000000000..75b34ae0d
--- /dev/null
+++ b/debian/patches/debian/armhf-sparc64-force-zone_dma-to-be-enabled.patch
@@ -0,0 +1,40 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Thu, 17 Dec 2015 17:37:09 +0000
+Subject: [armhf,sparc64] Force ZONE_DMA to be enabled
+Forwarded: not-needed
+
+CONFIG_ZONE_DMA is supposed to be selected according to the architecture
+configuration, not by drivers.
+
+In 4.3.3 several sound drivers were changed to depend on, rather than
+selecting, ZONE_DMA.  This disabled it and thus broke ABI for most
+arm{el,hf}, mips* and sparc64 flavours.
+
+Version 4.3.1-1 FTBFS on armel and didn't finish building on mips* in
+time to include an ABI reference for 4.3.3-1.  So the mips* flavours
+have quietly changed ABI (oops) while armhf and sparc now FTBFS.
+Leave mips* as it is, but force ZONE_DMA on to reverse the ABI change
+for armhf and sparc64.
+
+---
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -204,6 +204,7 @@ config ARCH_MAY_HAVE_PC_FDC
+ 
+ config ZONE_DMA
+ 	bool
++	default y if ARCH_MULTI_V7
+ 
+ config NEED_DMA_MAP_STATE
+        def_bool y
+--- a/arch/sparc/Kconfig
++++ b/arch/sparc/Kconfig
+@@ -131,7 +131,7 @@ config HIGHMEM
+ 
+ config ZONE_DMA
+ 	bool
+-	default y if SPARC32
++	default y
+ 
+ config NEED_DMA_MAP_STATE
+ 	def_bool y
diff --git a/debian/patches/series b/debian/patches/series
index f46bc86ef..7bae9d83f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -104,3 +104,4 @@ features/arm/arm-dts-add-support-odroid-xu4-board-for-exynos5422-.patch
 bugfix/all/revert-vrf-fix-double-free-and-memory-corruption-on-.patch
 bugfix/all/vrf-fix-double-free-and-memory-corruption-on-registe.patch
 bugfix/all/tipc-fix-kfree_skb-of-uninitialised-pointer.patch
+debian/armhf-sparc64-force-zone_dma-to-be-enabled.patch