Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / iommu / iommu.c

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 0e3b0092ec92c9d4d1dcb06e713edcf99c4a9293..bfd4f7c3b1d8a9da9ce6cd2bce3decd8e27e0fca 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1314,6 +1314,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
        unsigned long orig_iova = iova;
        unsigned int min_pagesz;
        size_t orig_size = size;
+       phys_addr_t orig_paddr = paddr;
        int ret = 0;
 
        if (unlikely(domain->ops->map == NULL ||
@@ -1358,7 +1359,7 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
        if (ret)
                iommu_unmap(domain, orig_iova, orig_size - size);
        else
-               trace_map(orig_iova, paddr, orig_size);
+               trace_map(orig_iova, orig_paddr, orig_size);
 
        return ret;
 }