diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-09-11 11:04:43 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-10-06 07:07:05 +0200 |
| commit | 5db5d93089880c3cc9e83ca8bba68a5502e92dfe (patch) | |
| tree | 07065191328222e06d0c826c772ba2477220e7e4 /arch/arm | |
| parent | dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h> (diff) | |
| download | linux-dev-5db5d93089880c3cc9e83ca8bba68a5502e92dfe.tar.xz linux-dev-5db5d93089880c3cc9e83ca8bba68a5502e92dfe.zip | |
dma-mapping: remove <asm/dma-contiguous.h>
Just provide a weak default definition of dma_contiguous_early_fixup and
let arm override it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/dma-contiguous.h | 15 | ||||
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/include/asm/dma-contiguous.h b/arch/arm/include/asm/dma-contiguous.h deleted file mode 100644 index d785187a6f8a..000000000000 --- a/arch/arm/include/asm/dma-contiguous.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef ASMARM_DMA_CONTIGUOUS_H -#define ASMARM_DMA_CONTIGUOUS_H - -#ifdef __KERNEL__ -#ifdef CONFIG_DMA_CMA - -#include <linux/types.h> - -void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size); - -#endif -#endif - -#endif diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 154c24cec94c..911fc6ea2607 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -34,7 +34,6 @@ #include <asm/dma-iommu.h> #include <asm/mach/map.h> #include <asm/system_info.h> -#include <asm/dma-contiguous.h> #include <xen/swiotlb-xen.h> #include "dma.h" |