summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-14 10:54:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-14 10:54:28 -0800
commitc833e17e276bd5d5f174aa924c4f102754ebc2be (patch)
tree90fb3d7c9b6ab66fa5d651675f054d5a7aa8a01a /arch/sh/mm
parentfee5429e028c414d80d036198db30454cfd91b7a (diff)
parentc5b19946eb76c67566aae6a84bf2b10ad59295ea (diff)
downloadlinux-c833e17e276bd5d5f174aa924c4f102754ebc2be.tar.gz
linux-c833e17e276bd5d5f174aa924c4f102754ebc2be.tar.bz2
linux-c833e17e276bd5d5f174aa924c4f102754ebc2be.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux
Pull ACCESS_ONCE() rule tightening from Christian Borntraeger: "Tighten rules for ACCESS_ONCE This series tightens the rules for ACCESS_ONCE to only work on scalar types. It also contains the necessary fixups as indicated by build bots of linux-next. Now everything is in place to prevent new non-scalar users of ACCESS_ONCE and we can continue to convert code to READ_ONCE/WRITE_ONCE" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux: kernel: Fix sparse warning for ACCESS_ONCE next: sh: Fix compile error kernel: tighten rules for ACCESS ONCE mm/gup: Replace ACCESS_ONCE with READ_ONCE x86/spinlock: Leftover conversion ACCESS_ONCE->READ_ONCE x86/xen/p2m: Replace ACCESS_ONCE with READ_ONCE ppc/hugetlbfs: Replace ACCESS_ONCE with READ_ONCE ppc/kvm: Replace ACCESS_ONCE with READ_ONCE
Diffstat (limited to 'arch/sh/mm')
-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 e15f52a17b6c..e7af6a65baab 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