x86: remove cruft from <asm/dma-mapping.h>

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

<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>

Christoph Hellwig 4 years ago 3cb4503a 6424e31b

+2 -11

2 changed files

expand all

arch

x86

include

asm

dma-mapping.h

iommu.h

-11

arch/x86/include/asm/dma-mapping.h

··· 2 2 #ifndef _ASM_X86_DMA_MAPPING_H 3 3 #define _ASM_X86_DMA_MAPPING_H 4 4 5 - /* 6 - * IOMMU interface. See Documentation/core-api/dma-api-howto.rst and 7 - * Documentation/core-api/dma-api.rst for documentation. 8 - */ 9 - 10 - #include <linux/scatterlist.h> 11 - #include <asm/io.h> 12 - 13 - extern int iommu_merge; 14 - extern int panic_on_overflow; 15 - 16 5 extern const struct dma_map_ops *dma_ops; 17 6 18 7 static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

arch/x86/include/asm/iommu.h

··· 8 8 9 9 extern int force_iommu, no_iommu; 10 10 extern int iommu_detected; 11 + extern int iommu_merge; 12 + extern int panic_on_overflow; 11 13 12 14 #ifdef CONFIG_SWIOTLB 13 15 extern bool x86_swiotlb_enable;