Commit 5012650a authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'iommu/amd/amd-vi' into iommu/next 

* iommu/amd/amd-vi:
  iommu/amd: Use try_cmpxchg64() in v2_alloc_pte()
parents 91b3a24a 9a448e45

drivers/iommu/amd/io_pgtable_v2.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static u64 *v2_alloc_pte(int nid, u64 *pgd, unsigned long iova, 


			__npte = set_pgtable_attr(page);

			/* pte could have been changed somewhere. */

			if (cmpxchg64(pte, __pte, __npte) != __pte)

			if (!try_cmpxchg64(pte, &__pte, __npte))

				iommu_free_page(page);

			else if (IOMMU_PTE_PRESENT(__pte))

				*updated = true;