diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-10 01:38:53 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-10 01:38:53 +0100 |
| commit | 1a8bd481bfba30515b54368d90a915db3faf302f (patch) | |
| tree | e90098ad46912fbe78fbbd09a2715cc3d6daf36a /drivers/pci | |
| parent | d1423d5679875ebbbc2fc63b33d465baceee0430 (diff) | |
| download | op-kernel-dev-1a8bd481bfba30515b54368d90a915db3faf302f.zip op-kernel-dev-1a8bd481bfba30515b54368d90a915db3faf302f.tar.gz | |
intel-iommu: Fix 32-bit build warning with __cmpxchg()
drivers/pci/intel-iommu.c: In function 'dma_pte_addr':
drivers/pci/intel-iommu.c:239: warning: passing argument 1 of '__cmpxchg64' from incompatible pointer type
It seems that __cmpxchg64() now cares about the type of its pointer argument,
so give it a (uint64_t *) instead of a pointer to a structure which contains
only that.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pci')
| -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 c9171be..603cdc0 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 } |
