From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 May 2015 07:20:58 +0000 (+1000)
Subject: rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()
X-Git-Tag: v4.2-rc1~59^2~2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=38183b9c31cf21d8996d6eee2e3a14508b20c418;hp=b51d23e4e9fea6f264d39535c2a62d1f51e7ccc3

rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()

This mirrors the change introduced by 7d0ae8086b8 of same title
in Linus' tree; it's not obvious as a merge resolution since we moved
the function.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index eae42c21d5fd..52bdec710ed7 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -467,7 +467,7 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
  */
 #define lockless_dereference(p) \
 ({ \
-	typeof(p) _________p1 = ACCESS_ONCE(p); \
+	typeof(p) _________p1 = READ_ONCE(p); \
 	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \
 	(_________p1); \
 })