diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-28 10:20:58 +0300 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2015-06-24 03:07:40 +0300 |
| commit | 38183b9c31cf21d8996d6eee2e3a14508b20c418 (patch) | |
| tree | c5c6d0ae2cf5ed48dc1473f4650839d1564db8bf /include/linux/compiler.h | |
| parent | b51d23e4e9fea6f264d39535c2a62d1f51e7ccc3 (diff) | |
| download | linux-38183b9c31cf21d8996d6eee2e3a14508b20c418.tar.xz | |
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>
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); \ }) |