summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-01-07 12:32:28 -0800
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-01-19 14:14:22 +0100
commit378af02b1aecabb3756e19c0cbb8cdd9c3b9637f (patch)
tree0b1f328c8e4b5eabaee8c4de50efceb0ca9aa0ca
parent927609d622a3773995f84bc03b4564f873cf0e22 (diff)
downloadop-kernel-dev-378af02b1aecabb3756e19c0cbb8cdd9c3b9637f.zip
op-kernel-dev-378af02b1aecabb3756e19c0cbb8cdd9c3b9637f.tar.gz
next: sh: Fix compile error
Commit 927609d622a3 ("kernel: tighten rules for ACCESS ONCE") results in a compile failure for sh builds with CONFIG_X2TLB enabled. arch/sh/mm/gup.c: In function 'gup_get_pte': arch/sh/mm/gup.c:20:2: error: invalid initializer make[1]: *** [arch/sh/mm/gup.o] Error 1 Replace ACCESS_ONCE with READ_ONCE to fix the problem. Fixes: 927609d622a3 ("kernel: tighten rules for ACCESS ONCE") Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-rw-r--r--arch/sh/mm/gup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c
index 37458f3..e113bb4 100644
--- a/arch/sh/mm/gup.c
+++ b/arch/sh/mm/gup.c
@@ -17,7 +17,7 @@
static inline pte_t gup_get_pte(pte_t *ptep)
{
#ifndef CONFIG_X2TLB
- return ACCESS_ONCE(*ptep);
+ return READ_ONCE(*ptep);
#else
/*
* With get_user_pages_fast, we walk down the pagetables without
OpenPOWER on IntegriCloud