diff options
| author | Rich Wiley <rwiley@nvidia.com> | 2013-09-17 16:45:14 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2014-01-21 15:14:05 -0800 |
| commit | c8cf166b7a4707e4024185780091595d4d70fe45 (patch) | |
| tree | 53c868b40dc08b85f0e729c005b30d5c9e089729 /drivers/iommu | |
| parent | 40e56ca05131dd0f2b3f3c9d222207a4c23f25b6 (diff) | |
arm64: smmu: pointer cast fix for tegra-smmu.c
Change-Id: I6a1979fe3ec0465d6a4beccc272db6a8114073b7
Signed-off-by: Rich Wiley <rwiley@nvidia.com>
Reviewed-on: http://git-master/r/276092
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Hiroshi Doyu <hdoyu@nvidia.com>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/iommu.c | 6 | ||||
| -rw-r--r-- | drivers/iommu/tegra-smmu.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 35bad4047206..c0c190217380 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -755,7 +755,7 @@ int iommu_domain_has_cap(struct iommu_domain *domain, EXPORT_SYMBOL_GPL(iommu_domain_has_cap); int iommu_map(struct iommu_domain *domain, unsigned long iova, - phys_addr_t paddr, size_t size, int prot) + phys_addr_t paddr, size_t size, unsigned long prot) { unsigned long orig_iova = iova; unsigned int min_pagesz; @@ -833,7 +833,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova, EXPORT_SYMBOL_GPL(iommu_map); int iommu_map_pages(struct iommu_domain *domain, unsigned long iova, - struct page **pages, size_t count, int prot) + struct page **pages, size_t count, unsigned long prot) { int err; @@ -846,7 +846,7 @@ int iommu_map_pages(struct iommu_domain *domain, unsigned long iova, EXPORT_SYMBOL_GPL(iommu_map_pages); int iommu_map_sg(struct iommu_domain *domain, unsigned long iova, - struct scatterlist *sgl, int nents, int prot) + struct scatterlist *sgl, int nents, unsigned long prot) { int err; diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 07de350c4dae..a6b106eb3bf8 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -1051,7 +1051,7 @@ static size_t __smmu_iommu_unmap_largepage(struct smmu_as *as, dma_addr_t iova) } static int __smmu_iommu_map_pfn(struct smmu_as *as, dma_addr_t iova, - unsigned long pfn, int prot) + unsigned long pfn, unsigned long prot) { struct smmu_device *smmu = as->smmu; u32 *pte; @@ -1079,7 +1079,7 @@ static int __smmu_iommu_map_pfn(struct smmu_as *as, dma_addr_t iova, } static int __smmu_iommu_map_page(struct smmu_as *as, dma_addr_t iova, - phys_addr_t pa, int prot) + phys_addr_t pa, unsigned long prot) { unsigned long pfn = __phys_to_pfn(pa); @@ -1087,7 +1087,7 @@ static int __smmu_iommu_map_page(struct smmu_as *as, dma_addr_t iova, } static int __smmu_iommu_map_largepage(struct smmu_as *as, dma_addr_t iova, - phys_addr_t pa, int prot) + phys_addr_t pa, unsigned long prot) { int pdn = SMMU_ADDR_TO_PDN(iova); u32 *pdir = (u32 *)page_address(as->pdir_page); @@ -1109,13 +1109,13 @@ static int __smmu_iommu_map_largepage(struct smmu_as *as, dma_addr_t iova, } static int smmu_iommu_map(struct iommu_domain *domain, unsigned long iova, - phys_addr_t pa, size_t bytes, int prot) + phys_addr_t pa, size_t bytes, unsigned long prot) { struct smmu_as *as = domain->priv; unsigned long flags; int err; int (*fn)(struct smmu_as *as, dma_addr_t iova, phys_addr_t pa, - int prot); + unsigned long prot); dev_dbg(as->smmu->dev, "[%d] %08lx:%pa\n", as->asid, iova, &pa); @@ -1138,7 +1138,7 @@ static int smmu_iommu_map(struct iommu_domain *domain, unsigned long iova, } static int smmu_iommu_map_pages(struct iommu_domain *domain, unsigned long iova, - struct page **pages, size_t total, int prot) + struct page **pages, size_t total, unsigned long prot) { struct smmu_as *as = domain->priv; struct smmu_device *smmu = as->smmu; @@ -1209,7 +1209,7 @@ out: } static int smmu_iommu_map_sg(struct iommu_domain *domain, unsigned long iova, - struct scatterlist *sgl, int npages, int prot) + struct scatterlist *sgl, int npages, unsigned long prot) { int err = 0; unsigned long iova_base = iova; |