diff --git a/debian/changelog b/debian/changelog index 73b00ef9c..3a37e0d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ linux (4.14~rc3-1~exp2) UNRELEASED; urgency=medium * net: Disable IRDA, which will soon be deleted upstream * [mips*] Increase RELOCATION_TABLE_SIZE to 0x00110000 for all flavours (fixes FTBFS) + * i40e: Build for 64-bit targets only (fixes FTBFS on hppa) -- Ben Hutchings Wed, 04 Oct 2017 01:44:24 +0100 diff --git a/debian/patches/bugfix/all/i40e-build-for-64-bit-targets-only.patch b/debian/patches/bugfix/all/i40e-build-for-64-bit-targets-only.patch new file mode 100644 index 000000000..e976be47f --- /dev/null +++ b/debian/patches/bugfix/all/i40e-build-for-64-bit-targets-only.patch @@ -0,0 +1,26 @@ +From: Ben Hutchings +Date: Wed, 4 Oct 2017 02:46:53 +0100 +Subject: i40e: Build for 64-bit targets only + +i40e now uses cmpxchg64(), which only works on a 64-bit (or non-SMP) +system. It seems reasonable to expect that 40G hardware is not used +on 32-bit systems. + +Fixes: 841c950d67c6 ("i40e/i40evf: use cmpxchg64 when updating private ...") +Signed-off-by: Ben Hutchings +--- + drivers/net/ethernet/intel/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig +index 1feb54b6d92e..dd17bdf5561e 100644 +--- a/drivers/net/ethernet/intel/Kconfig ++++ b/drivers/net/ethernet/intel/Kconfig +@@ -215,6 +215,7 @@ config I40E + tristate "Intel(R) Ethernet Controller XL710 Family support" + imply PTP_1588_CLOCK + depends on PCI ++ depends on 64BIT + ---help--- + This driver supports Intel(R) Ethernet Controller XL710 Family of + devices. For more information on how to identify your adapter, go diff --git a/debian/patches/series b/debian/patches/series index 0bc579330..8938ee6df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -76,6 +76,7 @@ bugfix/all/disable-some-marvell-phys.patch bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch +bugfix/all/i40e-build-for-64-bit-targets-only.patch # Miscellaneous features