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

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

Merge "iommu: Fix compilation error without CONFIG_IOMMU_API"

parents 5b7e2b26 c412cb15

include/linux/dma-mapping-fast.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/iommu.h>

#include <linux/io-pgtable-fast.h>



struct dma_iommu_mapping;



struct dma_fast_smmu_mapping {

	struct device		*dev;

	struct iommu_domain	*domain;

include/linux/iommu.h

+2 −2
Original line number Diff line number Diff line
@@ -650,8 +650,8 @@ static inline void iommu_device_unlink(struct device *dev, struct device *link) 
{

}



static int iommu_dma_supported(struct iommu_domain *domain, struct device *dev,

			       u64 mask)

static inline int iommu_dma_supported(struct iommu_domain *domain,

				      struct device *dev, u64 mask)

{

	return -EINVAL;

}

include/linux/msm_dma_iommu_mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static inline void msm_dma_unmap_sg(struct device *dev, 
{

}



int msm_dma_unmap_all_for_dev(struct device *dev)

static inline int msm_dma_unmap_all_for_dev(struct device *dev)

{

	return 0;

}