Those are needed by the rc6 and semaphores support in i915 driver. In i915 driver, we do not enable either rc6 or semaphores on SNB when dmar is enabled. So we use those variables to check the io remapping and iommu status. CC: Keith Packard <keithp at keithp.com> CC: Daniel Vetter <daniel.vetter at ffwll.ch> Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com> --- arch/x86/kernel/pci-dma.c | 1 + drivers/iommu/intel-iommu.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 80dc793..4c9191e 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -33,6 +33,7 @@ int force_iommu __read_mostly = 0; int iommu_merge __read_mostly = 0; int no_iommu __read_mostly; +EXPORT_SYMBOL_GPL(no_iommu); /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly = 0; diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index c0c7820..dfe5fd3 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -404,6 +404,7 @@ int dmar_disabled = 0; #else int dmar_disabled = 1; #endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/ +EXPORT_SYMBOL_GPL(dmar_disabled); static int dmar_map_gfx = 1; static int dmar_forcedac; -- 1.7.7.4
