diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-01-07 12:32:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-06 14:57:43 -0800 |
| commit | 74df55cf12da35361087869e3e4cb7e9e942d4f6 (patch) | |
| tree | c4328a673b0dfafb37b5e309f857f2f3fb58a25c /arch | |
| parent | e1adf6d7f02e9b25ac8bc618c29cae9f0d25cedb (diff) | |
next: sh: Fix compile error
commit 378af02b1aecabb3756e19c0cbb8cdd9c3b9637f upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/gup.c b/arch/sh/mm/gup.c index 37458f38b220..e113bb429e8e 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 |