diff options
-rw-r--r-- | arch/ia64/kernel/pci-dma.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 | ||||
-rw-r--r-- | drivers/pci/intel-iommu.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index eb987386f691..ecdde25d0d18 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -32,6 +32,8 @@ int force_iommu __read_mostly = 1; | |||
32 | int force_iommu __read_mostly; | 32 | int force_iommu __read_mostly; |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | int iommu_pass_through; | ||
36 | |||
35 | /* Dummy device used for NULL arguments (normally ISA). Better would | 37 | /* Dummy device used for NULL arguments (normally ISA). Better would |
36 | be probably a smaller DMA mask, but this is bug-to-bug compatible | 38 | be probably a smaller DMA mask, but this is bug-to-bug compatible |
37 | to i386. */ | 39 | to i386. */ |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 8cad0d854242..049005e82178 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -32,6 +32,8 @@ int no_iommu __read_mostly; | |||
32 | /* Set this to 1 if there is a HW IOMMU in the system */ | 32 | /* Set this to 1 if there is a HW IOMMU in the system */ |
33 | int iommu_detected __read_mostly = 0; | 33 | int iommu_detected __read_mostly = 0; |
34 | 34 | ||
35 | int iommu_pass_through; | ||
36 | |||
35 | dma_addr_t bad_dma_address __read_mostly = 0; | 37 | dma_addr_t bad_dma_address __read_mostly = 0; |
36 | EXPORT_SYMBOL(bad_dma_address); | 38 | EXPORT_SYMBOL(bad_dma_address); |
37 | 39 | ||
@@ -160,8 +162,6 @@ again: | |||
160 | return page_address(page); | 162 | return page_address(page); |
161 | } | 163 | } |
162 | 164 | ||
163 | extern int iommu_pass_through; | ||
164 | |||
165 | /* | 165 | /* |
166 | * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter | 166 | * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter |
167 | * documentation. | 167 | * documentation. |
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 13121821db7f..d3edd6aa82ce 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
@@ -288,7 +288,6 @@ int dmar_disabled = 1; | |||
288 | static int __initdata dmar_map_gfx = 1; | 288 | static int __initdata dmar_map_gfx = 1; |
289 | static int dmar_forcedac; | 289 | static int dmar_forcedac; |
290 | static int intel_iommu_strict; | 290 | static int intel_iommu_strict; |
291 | int iommu_pass_through; | ||
292 | 291 | ||
293 | #define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1)) | 292 | #define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1)) |
294 | static DEFINE_SPINLOCK(device_domain_lock); | 293 | static DEFINE_SPINLOCK(device_domain_lock); |