浏览代码

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>
David Woodhouse 15 年之前
父节点
当前提交
1a8bd481bf
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/pci/intel-iommu.c

+ 1 - 1
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;
 	return pte->val & VTD_PAGE_MASK;
 #else
 #else
 	/* Must have a full atomic 64-bit read */
 	/* 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
 #endif
 }
 }