projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger...
[cascardo/linux.git]
/
arch
/
sh
/
mm
/
gup.c
diff --git
a/arch/sh/mm/gup.c
b/arch/sh/mm/gup.c
index
e15f52a
..
e7af6a6
100644
(file)
--- 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