summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaoquan He <bhe@redhat.com>2016-09-15 10:50:50 +0200
committerJoerg Roedel <jroedel@suse.de>2016-09-19 15:49:01 +0200
commit134414fffc7fdad81e228d232f8ae12a0456127a (patch)
tree62e06f833b35b06c524cfeac4f3ca5d2924ae78a
parentMerge branch 'x86/amd-avic' into x86/amd (diff)
downloadlinux-134414fffc7fdad81e228d232f8ae12a0456127a.tar.xz
linux-134414fffc7fdad81e228d232f8ae12a0456127a.zip
iommu/amd: Clean up the cmpxchg64 invocation
Change it as it's designed for and keep it consistent with other places. Signed-off-by: Baoquan He <bhe@redhat.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/amd_iommu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index bebe728019af..897940c79a54 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1342,7 +1342,8 @@ static u64 *alloc_pte(struct protection_domain *domain,
__npte = PM_LEVEL_PDE(level, virt_to_phys(page));
- if (cmpxchg64(pte, __pte, __npte)) {
+ /* pte could have been changed somewhere. */
+ if (cmpxchg64(pte, __pte, __npte) != __pte) {
free_page((unsigned long)page);
continue;
}