summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2014-11-21 16:21:56 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-12-18 09:54:39 +0100
commit4218091cb45f601b889cd032e39fe6878a426e70 (patch)
tree36f63ef018f6842f91b2118240cc6a144ef52571
parent14cf3d977b80f5e355f8ac7547cf1b9ff9fb3e09 (diff)
downloadlinux-stable-4218091cb45f601b889cd032e39fe6878a426e70.tar.gz
linux-stable-4218091cb45f601b889cd032e39fe6878a426e70.tar.bz2
linux-stable-4218091cb45f601b889cd032e39fe6878a426e70.zip
mips/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>
-rw-r--r--arch/mips/mm/gup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index 06ce17c2a905..8aa50e3f3fce 100644
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -30,7 +30,7 @@ retry:
return pte;
#else
- return ACCESS_ONCE(*ptep);
+ return READ_ONCE(*ptep);
#endif
}