diff options
| author | Atul Raut <araut@codeaurora.org> | 2017-01-29 22:06:18 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-06 01:23:25 -0700 |
| commit | 9aa5d67e64944e7eeeb0eac8bbd2cc9f84c40716 (patch) | |
| tree | 88886c3a4f9cc223529548bfe4872e39511d82a0 | |
| parent | 57dcf47eb5a8216724608495cc3c26c3727ae0ea (diff) | |
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 <araut@codeaurora.org>
| -rw-r--r-- | arch/arm64/include/asm/dma-iommu.h | 4 | ||||
| -rw-r--r-- | 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 <linux/dma-debug.h> #include <linux/kmemcheck.h> #include <linux/kref.h> -#include <linux/dma-mapping-fast.h> 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 |