Commit 3cb4503a authored Feb 17, 2022 by Christoph Hellwig

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>

parent 6424e31b

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -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)

arch/x86/include/asm/iommu.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;