diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-02-17 15:10:54 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-04-18 07:21:14 +0200 |
| commit | 3cb4503a330159dc5cf2f8382181ccbabbbaa5b2 (patch) | |
| tree | 4bf79133fab0157792e527ab3428a66d2f05a549 /arch/x86/include/asm | |
| parent | swiotlb: remove swiotlb_init_with_tbl and swiotlb_init_late_with_tbl (diff) | |
| download | linux-3cb4503a330159dc5cf2f8382181ccbabbbaa5b2.tar.xz linux-3cb4503a330159dc5cf2f8382181ccbabbbaa5b2.zip | |
x86: remove cruft from <asm/dma-mapping.h>
<asm/dma-mapping.h> gets pulled in by all drivers using the DMA API.
Remove x86 internal variables and unnecessary includes from it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 11 | ||||
| -rw-r--r-- | arch/x86/include/asm/iommu.h | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 256fd8115223..1c66708e3062 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -2,17 +2,6 @@ #ifndef _ASM_X86_DMA_MAPPING_H #define _ASM_X86_DMA_MAPPING_H -/* - * IOMMU interface. See Documentation/core-api/dma-api-howto.rst and - * Documentation/core-api/dma-api.rst for documentation. - */ - -#include <linux/scatterlist.h> -#include <asm/io.h> - -extern int iommu_merge; -extern int panic_on_overflow; - extern const struct dma_map_ops *dma_ops; static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index dba89ed40d38..0bef44d30a27 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h @@ -8,6 +8,8 @@ extern int force_iommu, no_iommu; extern int iommu_detected; +extern int iommu_merge; +extern int panic_on_overflow; #ifdef CONFIG_SWIOTLB extern bool x86_swiotlb_enable; |