Messages in this thread Patch in this message | | | Date | Tue, 23 Aug 2011 17:05:21 -0700 | From | Suresh Siddha <> | Subject | [patch 4/8] 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 <suresh.b.siddha@intel.com> --- drivers/iommu/dmar.c | 3 --- 1 file changed, 3 deletions(-)
Index: tree/drivers/iommu/dmar.c =================================================================== --- tree.orig/drivers/iommu/dmar.c +++ tree/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; }
| |