Fix a compiling error caused by dmar_disabled. When CONFIG_INTEL_IOMMU is not defined, dmar_disabled is define as 1, and the codes like "dmar_disabled = 1;" may cause compiling error.
------- Signed-off-by: Li, Zhen-Hua <lizhenhua....@gmail.com> diff -urp a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c --- a/drivers/iommu/intel-iommu.c 2012-07-22 04:58:29.000000000 +0800 +++ b/drivers/iommu/intel-iommu.c 2012-08-15 16:05:56.000000000 +0800 @@ -425,7 +425,7 @@ static long list_size; static void domain_remove_dev_info(struct dmar_domain *domain); -#ifdef CONFIG_INTEL_IOMMU_DEFAULT_ON +#if defined(CONFIG_INTEL_IOMMU_DEFAULT_ON) && defined(CONFIG_INTEL_IOMMU) int dmar_disabled = 0; #else int dmar_disabled = 1; diff -urp a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h --- a/include/linux/dma_remapping.h 2012-07-22 04:58:29.000000000 +0800 +++ b/include/linux/dma_remapping.h 2012-08-15 16:05:59.000000000 +0800 @@ -44,7 +44,6 @@ static inline int iommu_calculate_max_sa static inline void free_dmar_iommu(struct intel_iommu *iommu) { } -#define dmar_disabled (1) #define intel_iommu_enabled (0) #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/