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 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
x86
/
mm
/
gup.c
diff --git
a/arch/x86/mm/gup.c
b/arch/x86/mm/gup.c
index
207d9ae
..
d754782
100644
(file)
--- a/
arch/x86/mm/gup.c
+++ b/
arch/x86/mm/gup.c
@@
-15,7
+15,7
@@
static inline pte_t gup_get_pte(pte_t *ptep)
{
#ifndef CONFIG_X86_PAE
- return
ACCESS
_ONCE(*ptep);
+ return
READ
_ONCE(*ptep);
#else
/*
* With get_user_pages_fast, we walk down the pagetables without taking