From: Suresh Siddha Date: Wed, 24 Aug 2011 00:05:21 +0000 (-0700) Subject: iommu: No need to set dmar_disabled in check_zero_address() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80990c5ba6de9040d2df7c06e3c222c61004085d;p=linux-beck.git iommu: No need to set dmar_disabled in check_zero_address() Before the restructruing of the x86 IOMMU code, intel_iommu_init() was getting called directly from pci_iommu_init() and hence needed to explicitly set dmar_disabled to 1 for the failure conditions of check_zero_address(). Recent changes don't call intel_iommu_init() if the intel iommu detection fails as a result of failure in check_zero_address(). So no need for this ifdef and the code inside it. Signed-off-by: Suresh Siddha Cc: yinghai@kernel.org Cc: youquan.song@intel.com Cc: joerg.roedel@amd.com Cc: tony.luck@intel.com Cc: dwmw2@infradead.org Link: http://lkml.kernel.org/r/20110824001456.334878686@sbsiddha-desk.sc.intel.com Signed-off-by: Ingo Molnar --- diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index a10ccf2432c8..6f0422dcd0f5 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -540,9 +540,6 @@ int __init check_zero_address(void) return 1; failed: -#ifdef CONFIG_DMAR - dmar_disabled = 1; -#endif return 0; }