Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bef916fb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dma-mapping: fix build when !CONFIG_ARM_SMMU"

parents 889ae645 7545254c

arch/arm64/include/asm/dma-iommu.h

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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