summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/iommu.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2022-02-17 15:10:54 +0100
committerChristoph Hellwig <hch@lst.de>2022-04-18 07:21:14 +0200
commit3cb4503a330159dc5cf2f8382181ccbabbbaa5b2 (patch)
tree4bf79133fab0157792e527ab3428a66d2f05a549 /arch/x86/include/asm/iommu.h
parent6424e31b1c050a25aea033206d5f626f3523448c (diff)
downloadlinux-stable-3cb4503a330159dc5cf2f8382181ccbabbbaa5b2.tar.gz
linux-stable-3cb4503a330159dc5cf2f8382181ccbabbbaa5b2.tar.bz2
linux-stable-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/iommu.h')
-rw-r--r--arch/x86/include/asm/iommu.h2
1 files changed, 2 insertions, 0 deletions
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;