diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-14 13:54:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-14 13:54:28 -0500 |
commit | c833e17e276bd5d5f174aa924c4f102754ebc2be (patch) | |
tree | 90fb3d7c9b6ab66fa5d651675f054d5a7aa8a01a /mm | |
parent | fee5429e028c414d80d036198db30454cfd91b7a (diff) | |
parent | c5b19946eb76c67566aae6a84bf2b10ad59295ea (diff) |
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 'mm')
-rw-r--r-- | mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1092,7 +1092,7 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, | |||
1092 | 1092 | ||
1093 | pmdp = pmd_offset(&pud, addr); | 1093 | pmdp = pmd_offset(&pud, addr); |
1094 | do { | 1094 | do { |
1095 | pmd_t pmd = ACCESS_ONCE(*pmdp); | 1095 | pmd_t pmd = READ_ONCE(*pmdp); |
1096 | 1096 | ||
1097 | next = pmd_addr_end(addr, end); | 1097 | next = pmd_addr_end(addr, end); |
1098 | if (pmd_none(pmd) || pmd_trans_splitting(pmd)) | 1098 | if (pmd_none(pmd) || pmd_trans_splitting(pmd)) |