From 1dc87c3c6cff4b88f864549ce5941785e0fba8e9 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Tue, 10 Aug 2010 01:38:53 +0100
Subject: [PATCH] --- yaml --- r: 209506 b: refs/heads/master c:
 1a8bd481bfba30515b54368d90a915db3faf302f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b5127157baf2..853f1d9bf9f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1423d5679875ebbbc2fc63b33d465baceee0430
+refs/heads/master: 1a8bd481bfba30515b54368d90a915db3faf302f
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index c9171be74564..603cdc0c854a 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -236,7 +236,7 @@ static inline u64 dma_pte_addr(struct dma_pte *pte)
 	return pte->val & VTD_PAGE_MASK;
 #else
 	/* Must have a full atomic 64-bit read */
-	return  __cmpxchg64(pte, 0ULL, 0ULL) & VTD_PAGE_MASK;
+	return  __cmpxchg64(&pte->val, 0ULL, 0ULL) & VTD_PAGE_MASK;
 #endif
 }