From 9aa5d67e64944e7eeeb0eac8bbd2cc9f84c40716 Mon Sep 17 00:00:00 2001 From: Atul Raut Date: Sun, 29 Jan 2017 22:06:18 -0800 Subject: dma-mapping: fix build when !CONFIG_ARM_SMMU Allow compilation when CONFIG_ARM_SMMU is not selected by making CONFIG_IOMMU_IO_PGTABLE_FAST depends on CONFIG_ARM64_DMA_USE_IOMMU. Removed inclusion of dma-mapping-fast.h by dma-iommu.h. CRs-Fixed: 2000526 Change-Id: Iadfc236f848f46e6742a98581dbfdb13c7a2695e Signed-off-by: Atul Raut --- arch/arm64/include/asm/dma-iommu.h | 4 ++-- drivers/iommu/Kconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/dma-iommu.h b/arch/arm64/include/asm/dma-iommu.h index ba8f19a13a31..c16cf151f689 100644 --- a/arch/arm64/include/asm/dma-iommu.h +++ b/arch/arm64/include/asm/dma-iommu.h @@ -9,7 +9,6 @@ #include #include #include -#include struct dma_iommu_mapping { /* iommu specific data */ @@ -21,8 +20,9 @@ struct dma_iommu_mapping { spinlock_t lock; struct kref kref; - +#ifdef CONFIG_IOMMU_IO_PGTABLE_FAST struct dma_fast_smmu_mapping *fast; +#endif }; #ifdef CONFIG_ARM64_DMA_USE_IOMMU diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index f64111886584..7a504b1ad94d 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -41,7 +41,7 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST config IOMMU_IO_PGTABLE_FAST bool "Fast ARMv7/v8 Long Descriptor Format" - select IOMMU_IO_PGTABLE + depends on ARM64_DMA_USE_IOMMU help Enable support for a subset of the ARM long descriptor pagetable format. This allocator achieves fast performance by -- cgit v1.2.3