LU-12270 o2iblnd: pci_unmap_addr() removed in 4.19

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd.h

diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index af6aa3d..28d4acf 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -43,7 +43,6 @@
 
 #endif
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -65,9 +64,6 @@
 #include <linux/kmod.h>
 #include <linux/sysctl.h>
 #include <linux/pci.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)
-#include <linux/pci-dma.h>
-#endif
 
 #include <net/sock.h>
 #include <linux/in.h>
@@ -566,7 +562,7 @@ struct kib_rx {                                     /* receive message */
        /* message buffer (I/O addr) */
        __u64                   rx_msgaddr;
        /* for dma_unmap_single() */
-       DECLARE_PCI_UNMAP_ADDR(rx_msgunmap);
+       DEFINE_DMA_UNMAP_ADDR(rx_msgunmap);
        /* receive work item... */
        struct ib_recv_wr       rx_wrq;
        /* ...and its memory */
@@ -606,7 +602,7 @@ struct kib_tx {                                     /* transmit message */
        /* message buffer (I/O addr) */
        __u64                   tx_msgaddr;
        /* for dma_unmap_single() */
-       DECLARE_PCI_UNMAP_ADDR(tx_msgunmap);
+       DEFINE_DMA_UNMAP_ADDR(tx_msgunmap);
        /** sge for tx_msgaddr */
        struct ib_sge           tx_msgsge;
        /* # send work items */