aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/dma-mapping.c3
-rw-r--r--arch/ia64/kernel/pci-swiotlb.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
index 7060e13fa421..086a2aeb0404 100644
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
@@ -1,5 +1,8 @@
1#include <linux/dma-mapping.h> 1#include <linux/dma-mapping.h>
2 2
3/* Set this to 1 if there is a HW IOMMU in the system */
4int iommu_detected __read_mostly;
5
3struct dma_map_ops *dma_ops; 6struct dma_map_ops *dma_ops;
4EXPORT_SYMBOL(dma_ops); 7EXPORT_SYMBOL(dma_ops);
5 8
diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
index d21dea44e76f..717ad4f1c708 100644
--- a/arch/ia64/kernel/pci-swiotlb.c
+++ b/arch/ia64/kernel/pci-swiotlb.c
@@ -13,9 +13,6 @@
13int swiotlb __read_mostly; 13int swiotlb __read_mostly;
14EXPORT_SYMBOL(swiotlb); 14EXPORT_SYMBOL(swiotlb);
15 15
16/* Set this to 1 if there is a HW IOMMU in the system */
17int iommu_detected __read_mostly;
18
19struct dma_map_ops swiotlb_dma_ops = { 16struct dma_map_ops swiotlb_dma_ops = {
20 .alloc_coherent = swiotlb_alloc_coherent, 17 .alloc_coherent = swiotlb_alloc_coherent,
21 .free_coherent = swiotlb_free_coherent, 18 .free_coherent = swiotlb_free_coherent,