summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-12-24 13:57:08 +0100
committerChristoph Hellwig <hch@lst.de>2018-01-15 09:35:53 +0100
commit4fac8076df854aa4ddb8acbf6cce9d337300219e (patch)
tree5bc357f2c2b646a18c09b2a89d14ebb2b70954de /drivers/iommu
parent543cea9accd9804307541cb93d3ed7ec94b07237 (diff)
downloadop-kernel-dev-4fac8076df854aa4ddb8acbf6cce9d337300219e.zip
op-kernel-dev-4fac8076df854aa4ddb8acbf6cce9d337300219e.tar.gz
ia64: clean up swiotlb support
Move the few remaining bits of swiotlb glue towards their callers, and remove the pointless on ia64 swiotlb variable. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/intel-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 4a2de34..a1373cf 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4808,7 +4808,7 @@ int __init intel_iommu_init(void)
up_write(&dmar_global_lock);
pr_info("Intel(R) Virtualization Technology for Directed I/O\n");
-#ifdef CONFIG_SWIOTLB
+#if defined(CONFIG_X86) && defined(CONFIG_SWIOTLB)
swiotlb = 0;
#endif
dma_ops = &intel_dma_ops;
OpenPOWER on IntegriCloud