evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "iommu: Fix compilation error without CONFIG_IOMMU_API"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-06 12:25:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit c484f1d883
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/dma-mapping-fast.h
View file

@ -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;

4
include/linux/iommu.h
View file

@ -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;
}

2
include/linux/msm_dma_iommu_mapping.h
View file

@ -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;
}