diff options
author | Christoph Hellwig <hch@lst.de> | 2019-11-13 08:18:34 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-15 10:36:59 +0100 |
commit | 90dc392fc445ee2fc17c2617e306774b269386ac (patch) | |
tree | 5256af5e96abc028f818ca3f47184ad0a32aed3c /arch/x86/kernel/pci-dma.c | |
parent | 44eb5a7e5dc6f23d04c05c15f91bc279e0dc700d (diff) | |
download | linux-stable-90dc392fc445ee2fc17c2617e306774b269386ac.tar.gz linux-stable-90dc392fc445ee2fc17c2617e306774b269386ac.tar.bz2 linux-stable-90dc392fc445ee2fc17c2617e306774b269386ac.zip |
x86: Remove the calgary IOMMU driver
The calgary IOMMU was only used on high-end IBM systems in the early
x86_64 age and has no known users left. Remove it to avoid having to
touch it for pending changes to the DMA API.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20191113071836.21041-2-hch@lst.de
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index fa4352dce491..57de2ebff7e2 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -12,7 +12,6 @@ #include <asm/dma.h> #include <asm/iommu.h> #include <asm/gart.h> -#include <asm/calgary.h> #include <asm/x86_init.h> #include <asm/iommu_table.h> @@ -112,11 +111,6 @@ static __init int iommu_setup(char *p) gart_parse_options(p); -#ifdef CONFIG_CALGARY_IOMMU - if (!strncmp(p, "calgary", 7)) - use_calgary = 1; -#endif /* CONFIG_CALGARY_IOMMU */ - p += strcspn(p, ","); if (*p == ',') ++p; |