diff options
| author | Thierry Reding | 2015-04-09 16:39:51 +0200 |
|---|---|---|
| committer | Rob Clark | 2015-05-14 17:19:25 +0200 |
| commit | fc99f97af2f79be02c5045c9a02c50bdcc0c8ff8 (patch) | |
| tree | 077f0094ac7db90d2a86c73f9b99bdb47ef2825a /drivers/gpu/drm/msm/msm_iommu.c | |
| parent | Merge tag 'drm-intel-fixes-2015-05-08' of git://anongit.freedesktop.org/drm-i... (diff) | |
| download | kernel-qcow2-linux-fc99f97af2f79be02c5045c9a02c50bdcc0c8ff8.tar.gz kernel-qcow2-linux-fc99f97af2f79be02c5045c9a02c50bdcc0c8ff8.tar.xz kernel-qcow2-linux-fc99f97af2f79be02c5045c9a02c50bdcc0c8ff8.zip | |
drm/msm: Fix a couple of 64-bit build warnings
Avoid casts from pointers to fixed-size integers to prevent the compiler
from warning. Print virtual memory addresses using %p instead. Also turn
a couple of %d/%x specifiers into %zu/%zd/%zx to avoid further warnings
due to mismatched format strings.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_iommu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index 7acdaa5688b7..7ac2f1997e4a 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -60,7 +60,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint32_t iova, u32 pa = sg_phys(sg) - sg->offset; size_t bytes = sg->length + sg->offset; - VERB("map[%d]: %08x %08x(%x)", i, iova, pa, bytes); + VERB("map[%d]: %08x %08x(%zx)", i, iova, pa, bytes); ret = iommu_map(domain, da, pa, bytes, prot); if (ret) @@ -99,7 +99,7 @@ static int msm_iommu_unmap(struct msm_mmu *mmu, uint32_t iova, if (unmapped < bytes) return unmapped; - VERB("unmap[%d]: %08x(%x)", i, iova, bytes); + VERB("unmap[%d]: %08x(%zx)", i, iova, bytes); BUG_ON(!PAGE_ALIGNED(bytes)); |