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

[linux-2.6-microblaze.git] / drivers / iommu / amd_iommu.c

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 73e47d9..bee0dfb 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3069,7 +3069,7 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
                return 0;
 
        offset_mask = pte_pgsize - 1;
-       __pte       = *pte & PM_ADDR_MASK;
+       __pte       = __sme_clr(*pte & PM_ADDR_MASK);
 
        return (__pte & ~offset_mask) | (iova & offset_mask);
 }