diff --git a/debian/changelog b/debian/changelog
index 21a7c3db5..c9630af4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ linux (4.17~rc4-1~exp1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * Fix building only versioned tools packages
   * Reclassify lockdep packages as unversioned tools
+  * [hppa/parisc64-smp] IB: Fix RDMA_RXE and INFINIBAND_RDMAVT dependencies for
+    DMA_VIRT_OPS
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 02 May 2018 12:59:01 +0100
 
diff --git a/debian/patches/bugfix/all/ib-fix-rdma_rxe-and-infiniband_rdmavt-dependencies-f.patch b/debian/patches/bugfix/all/ib-fix-rdma_rxe-and-infiniband_rdmavt-dependencies-f.patch
new file mode 100644
index 000000000..3cb594ecb
--- /dev/null
+++ b/debian/patches/bugfix/all/ib-fix-rdma_rxe-and-infiniband_rdmavt-dependencies-f.patch
@@ -0,0 +1,49 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Wed, 9 May 2018 22:31:41 +0100
+Subject: IB: Fix RDMA_RXE and INFINIBAND_RDMAVT dependencies for DMA_VIRT_OPS
+
+DMA_VIRT_OPS requires that dma_addr_t is at least as wide as a
+pointer, which is expressed as a dependency on !64BIT ||
+ARCH_DMA_ADDR_T_64BIT.
+
+For parisc64 this is not true, and if these IB modules are enabled,
+kconfig warns:
+
+WARNING: unmet direct dependencies detected for DMA_VIRT_OPS
+  Depends on [n]: HAS_DMA [=y] && (!64BIT [=y] || ARCH_DMA_ADDR_T_64BIT)
+  Selected by [m]:
+  - INFINIBAND_RDMAVT [=m] && INFINIBAND [=m] && 64BIT [=y] && PCI [=y]
+  - RDMA_RXE [=m] && INET [=y] && PCI [=y] && INFINIBAND [=m]
+
+Add dependencies to fix this.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/infiniband/sw/rdmavt/Kconfig | 2 +-
+ drivers/infiniband/sw/rxe/Kconfig    | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/infiniband/sw/rdmavt/Kconfig b/drivers/infiniband/sw/rdmavt/Kconfig
+index 2b5513da7e83..98e798007f75 100644
+--- a/drivers/infiniband/sw/rdmavt/Kconfig
++++ b/drivers/infiniband/sw/rdmavt/Kconfig
+@@ -1,6 +1,6 @@
+ config INFINIBAND_RDMAVT
+ 	tristate "RDMA verbs transport library"
+-	depends on 64BIT
++	depends on 64BIT && ARCH_DMA_ADDR_T_64BIT
+ 	depends on PCI
+ 	select DMA_VIRT_OPS
+ 	---help---
+diff --git a/drivers/infiniband/sw/rxe/Kconfig b/drivers/infiniband/sw/rxe/Kconfig
+index bad4a576d7cf..67ae960ab523 100644
+--- a/drivers/infiniband/sw/rxe/Kconfig
++++ b/drivers/infiniband/sw/rxe/Kconfig
+@@ -1,6 +1,7 @@
+ config RDMA_RXE
+ 	tristate "Software RDMA over Ethernet (RoCE) driver"
+ 	depends on INET && PCI && INFINIBAND
++	depends on !64BIT || ARCH_DMA_ADDR_T_64BIT
+ 	select NET_UDP_TUNNEL
+ 	select CRYPTO_CRC32
+ 	select DMA_VIRT_OPS
diff --git a/debian/patches/series b/debian/patches/series
index a11aa6de7..e99ab1474 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -78,6 +78,7 @@ 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
+bugfix/all/ib-fix-rdma_rxe-and-infiniband_rdmavt-dependencies-f.patch
 
 # Miscellaneous features