summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-09-22 15:36:11 +0200
committerChristoph Hellwig <hch@lst.de>2020-10-06 07:07:06 +0200
commit9f4df96b8781e40d0cb0e32eb3d1f6d87375adf9 (patch)
tree922b39888e7a236fcabf3d966b4b3b255a5a2e72 /drivers
parentdma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma (diff)
downloadlinux-9f4df96b8781e40d0cb0e32eb3d1f6d87375adf9.tar.xz
linux-9f4df96b8781e40d0cb0e32eb3d1f6d87375adf9.zip
dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>
Move more nitty gritty DMA implementation details into the common internal header. Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/dma-iommu.c1
-rw-r--r--drivers/xen/swiotlb-xen.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 22c221bba13e..3a00fb64477b 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -12,7 +12,6 @@
#include <linux/device.h>
#include <linux/dma-map-ops.h>
#include <linux/dma-iommu.h>
-#include <linux/dma-noncoherent.h>
#include <linux/gfp.h>
#include <linux/huge_mm.h>
#include <linux/iommu.h>
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 71ff4bf38073..71ce1b7a23d1 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -27,9 +27,8 @@
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/memblock.h>
-#include <linux/dma-map-ops.h>
#include <linux/dma-direct.h>
-#include <linux/dma-noncoherent.h>
+#include <linux/dma-map-ops.h>
#include <linux/export.h>
#include <xen/swiotlb-xen.h>
#include <xen/page.h>