瀏覽代碼

x86/gup: Replace ACCESS_ONCE with READ_ONCE

ACCESS_ONCE does not work reliably on non-scalar types. For
example gcc 4.6 and 4.7 might remove the volatile tag for such
accesses during the SRA (scalar replacement of aggregates) step
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145)

Change the gup code to replace ACCESS_ONCE with READ_ONCE.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Christian Borntraeger 10 年之前
父節點
當前提交
14cf3d977b
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/x86/mm/gup.c

+ 1 - 1
arch/x86/mm/gup.c

@@ -15,7 +15,7 @@
 static inline pte_t gup_get_pte(pte_t *ptep)
 static inline pte_t gup_get_pte(pte_t *ptep)
 {
 {
 #ifndef CONFIG_X86_PAE
 #ifndef CONFIG_X86_PAE
-	return ACCESS_ONCE(*ptep);
+	return READ_ONCE(*ptep);
 #else
 #else
 	/*
 	/*
 	 * With get_user_pages_fast, we walk down the pagetables without taking
 	 * With get_user_pages_fast, we walk down the pagetables without taking