commit bcac5c5160e30df7fca70e92d16a573f8bf4434b
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 29 13:28:23 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 29 13:28:22 2013 -0700
tree 9f48e40416fbe6cf30f83ddde5bc110de6ab2e42
parent bf6f3647a0a4d5a04bbafbea9d9aa666fe35eeb0
parent 70f5926062a198b6553f50c982b684071e95ba8c

Merge "iommu: msm: Use ion_phys_addr_t for iova argument"

drivers/gpu/ion/msm/ion_iommu_map.c

diff --git a/drivers/gpu/ion/msm/ion_iommu_map.c b/drivers/gpu/ion/msm/ion_iommu_map.c
index 3e1a7ee..c2b65ba 100644
--- a/drivers/gpu/ion/msm/ion_iommu_map.c
+++ b/drivers/gpu/ion/msm/ion_iommu_map.c
@@ -285,7 +285,7 @@
 static struct ion_iommu_map *__ion_iommu_map(struct ion_iommu_meta *meta,
 		int domain_num, int partition_num, unsigned long align,
 		unsigned long iova_length, unsigned long flags,
-		unsigned long *iova)
+		ion_phys_addr_t *iova)
 {
 	struct ion_iommu_map *data;
 	int ret;
@@ -367,7 +367,7 @@
 
 int ion_map_iommu(struct ion_client *client, struct ion_handle *handle,
 			int domain_num, int partition_num, unsigned long align,
-			unsigned long iova_length, unsigned long *iova,
+			unsigned long iova_length, ion_phys_addr_t *iova,
 			unsigned long *buffer_size,
 			unsigned long flags, unsigned long iommu_flags)
 {