diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-16 04:34:20 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-16 04:34:20 +0400 |
| commit | e2e96c663639a3361bb1a84e666887d308c6c87e (patch) | |
| tree | 7c28b1e5baaff4741d974193ba30f1c53992596f /drivers/pci/intel-iommu.c | |
| parent | 7355a5a654ccbbfd2fd11bb1e2389910f786ea92 (diff) | |
| parent | 1a8bd481bfba30515b54368d90a915db3faf302f (diff) | |
| download | linux-e2e96c663639a3361bb1a84e666887d308c6c87e.tar.xz | |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Fix 32-bit build warning with __cmpxchg()
intr-remap: allow disabling source id checking
Diffstat (limited to 'drivers/pci/intel-iommu.c')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index b0de57947189..c3ceebb5be84 100644 --- a/drivers/pci/intel-iommu.c +++ b/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 } |