diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-22 15:36:11 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-10-06 07:07:06 +0200 |
| commit | 9f4df96b8781e40d0cb0e32eb3d1f6d87375adf9 (patch) | |
| tree | 922b39888e7a236fcabf3d966b4b3b255a5a2e72 /kernel/dma | |
| parent | 19c65c3d30bb5a97170e425979d2e44ab2096c7d (diff) | |
| download | linux-stable-9f4df96b8781e40d0cb0e32eb3d1f6d87375adf9.tar.gz linux-stable-9f4df96b8781e40d0cb0e32eb3d1f6d87375adf9.tar.bz2 linux-stable-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 'kernel/dma')
| -rw-r--r-- | kernel/dma/ops_helpers.c | 1 | ||||
| -rw-r--r-- | kernel/dma/pool.c | 1 | ||||
| -rw-r--r-- | kernel/dma/swiotlb.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/kernel/dma/ops_helpers.c b/kernel/dma/ops_helpers.c index bc80fd2648bc..910ae69cae77 100644 --- a/kernel/dma/ops_helpers.c +++ b/kernel/dma/ops_helpers.c @@ -4,7 +4,6 @@ * the allocated memory contains normal pages in the direct kernel mapping. */ #include <linux/dma-map-ops.h> -#include <linux/dma-noncoherent.h> /* * Create scatter-list for the already allocated DMA buffer. diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c index c9fb5c3d8bd0..d4637f72239b 100644 --- a/kernel/dma/pool.c +++ b/kernel/dma/pool.c @@ -7,7 +7,6 @@ #include <linux/debugfs.h> #include <linux/dma-map-ops.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> #include <linux/init.h> #include <linux/genalloc.h> #include <linux/set_memory.h> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 4ea72d145cd2..2be1e8b34ae3 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -22,7 +22,7 @@ #include <linux/cache.h> #include <linux/dma-direct.h> -#include <linux/dma-noncoherent.h> +#include <linux/dma-map-ops.h> #include <linux/mm.h> #include <linux/export.h> #include <linux/spinlock.h> |