From 90520391a247b079fab8aefce2d016452ae8d014 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 15 Mar 2018 19:07:24 +0000 Subject: [PATCH] i40e: Add kconfig dependency to ensure cmpxchg64() is available This should fix FTBFS on architectures where it isn't. --- debian/changelog | 2 ++ .../i40e-build-for-64-bit-targets-only.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/bugfix/all/i40e-build-for-64-bit-targets-only.patch diff --git a/debian/changelog b/debian/changelog index dd0c7423e..a1977287c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ linux (4.16~rc5-1~exp2) UNRELEASED; urgency=medium [ Ben Hutchings ] * udeb: Add dependency from nic-modules to zlib-modules (fixes FTBFS on some architectures) + * i40e: Add kconfig dependency to ensure cmpxchg64() is available + (fixes FTBFS on some architectures) -- Ben Hutchings Tue, 13 Mar 2018 16:12:54 +0000 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..ec1e87c14 --- /dev/null +++ b/debian/patches/bugfix/all/i40e-build-for-64-bit-targets-only.patch @@ -0,0 +1,26 @@ +From: Ben Hutchings +Date: Thu, 15 Mar 2018 19:02:28 +0000 +Subject: i40e: Add kconfig dependency to ensure cmpxchg64() is available + +i40e again uses cmpxchg64(), which isn't available in some 32-bit SMP +configurations. It seems reasonable to expect that 40G hardware is +not used on 32-bit systems. + +Fixes: 60f481b97038 ("i40e: change flags to use 64 bits") +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 || X86_CMPXCHG64 + ---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 b40b705d7..7f2a5dd4a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -78,6 +78,7 @@ 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 debian/revert-objtool-fix-config_stack_validation-y-warning.patch +bugfix/all/i40e-build-for-64-bit-targets-only.patch # Miscellaneous features