xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next

Browse Source
This commit is contained in:
Joerg Roedel
2014-01-09 13:06:59 +01:00
parent e2c22d9599 cbff5634dc 9f4c7448f4 e87c621dce b82a2272b3 b3eb76d175 5b5c13996f 4c071c7b85
commit dd1a175695
162 changed files with 1689 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/iommu.h
View File

@@ -248,6 +248,11 @@ static inline struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
return NULL;
}
static inline struct iommu_group *iommu_group_get_by_id(int id)
{
return NULL;
}
static inline void iommu_domain_free(struct iommu_domain *domain)
{
}
@@ -292,8 +297,8 @@ static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_ad
return 0;
}
static inline int domain_has_cap(struct iommu_domain *domain,
unsigned long cap)
static inline int iommu_domain_has_cap(struct iommu_domain *domain,
unsigned long cap)
{
return 0;
}