Merge "arm64: dma-mapping: fix build when !CONFIG_ARM64_DMA_USE_IOMMU" into msm-4.8 (8c7aa7b0) · Commits · e / devices / android_kernel_fairphone_FP3

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

+27 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@

		#ifdef __KERNEL__

		#include <linux/err.h>
		#include <linux/mm_types.h>
		#include <linux/scatterlist.h>
		#include <linux/dma-debug.h>
		@@ -22,6 +23,8 @@ struct dma_iommu_mapping {
		struct kref kref;
		};

		#ifdef CONFIG_ARM64_DMA_USE_IOMMU

		struct dma_iommu_mapping *
		arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size,
		int order);
		@@ -32,5 +35,29 @@ int arm_iommu_attach_device(struct device *dev,
		struct dma_iommu_mapping *mapping);
		void arm_iommu_detach_device(struct device *dev);

		#else /* !CONFIG_ARM64_DMA_USE_IOMMU */

		static inline struct dma_iommu_mapping *
		arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size)
		{
		return NULL;
		}

		static inline void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping)
		{
		}

		static inline int arm_iommu_attach_device(struct device *dev,
		struct dma_iommu_mapping *mapping)
		{
		return -ENODEV;
		}

		static inline void arm_iommu_detach_device(struct device *dev)
		{
		}

		#endif /* CONFIG_ARM64_DMA_USE_IOMMU */

		#endif /* __KERNEL__ */
		#endif