When CONFIG_DMAR is off, linux-next or iomm-2.6.git kernel build complains "undefined iommu_pass_through" error. This patch moves iommu_pass_through beyond CONFIG_DMAR and fixes this issue. Signed-off-by: Fenghua Yu <fenghua.yu@xxxxxxxxx> Acked-by: Tony Luck <tony.luck@xxxxxxxxx> --- arch/ia64/kernel/dma-mapping.c | 2 ++ arch/x86/kernel/pci-dma.c | 2 ++ drivers/pci/intel-iommu.c | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c index 086a2ae..336ccdc 100644 --- a/arch/ia64/kernel/dma-mapping.c +++ b/arch/ia64/kernel/dma-mapping.c @@ -3,6 +3,8 @@ /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly; +int iommu_pass_through; + struct dma_map_ops *dma_ops; EXPORT_SYMBOL(dma_ops); diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 8cad0d8..14fddef 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -32,6 +32,8 @@ int no_iommu __read_mostly; /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly = 0; +int iommu_pass_through; + dma_addr_t bad_dma_address __read_mostly = 0; EXPORT_SYMBOL(bad_dma_address); diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 1312182..d3edd6a 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c @@ -288,7 +288,6 @@ int dmar_disabled = 1; static int __initdata dmar_map_gfx = 1; static int dmar_forcedac; static int intel_iommu_strict; -int iommu_pass_through; #define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1)) static DEFINE_SPINLOCK(device_domain_lock); -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
