Commit-ID: 5bde06b63af2af8c2326270aae041067eef89245 Gitweb: https://git.kernel.org/tip/5bde06b63af2af8c2326270aae041067eef89245 Author: Mark Rutland <mark.rutl...@arm.com> AuthorDate: Mon, 16 Jul 2018 11:05:56 -0700 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 17 Jul 2018 09:29:34 +0200
tools/memory-model: Remove ACCESS_ONCE() from recipes Since commit: b899a850431e2dd0 ("compiler.h: Remove ACCESS_ONCE()") ... there has been no definition of ACCESS_ONCE() in the kernel tree, and it has been necessary to use READ_ONCE() or WRITE_ONCE() instead. Let's update the exmaples in recipes.txt likewise for consistency, using READ_ONCE() for reads. Signed-off-by: Mark Rutland <mark.rutl...@arm.com> Signed-off-by: Paul E. McKenney <paul...@linux.vnet.ibm.com> Acked-by: Andrea Parri <andrea.pa...@amarulasolutions.com> Cc: Akira Yokosawa <aki...@gmail.com> Cc: Alan Stern <st...@rowland.harvard.edu> Cc: Boqun Feng <boqun.f...@gmail.com> Cc: David Howells <dhowe...@redhat.com> Cc: Jade Alglave <j.algl...@ucl.ac.uk> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Luc Maranget <luc.maran...@inria.fr> Cc: Nicholas Piggin <npig...@gmail.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Will Deacon <will.dea...@arm.com> Cc: linux-a...@vger.kernel.org Cc: parri.and...@gmail.com Link: http://lkml.kernel.org/r/20180716180605.16115-5-paul...@linux.vnet.ibm.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- tools/memory-model/Documentation/recipes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/memory-model/Documentation/recipes.txt b/tools/memory-model/Documentation/recipes.txt index ee4309a87fc4..1fea8ef2b184 100644 --- a/tools/memory-model/Documentation/recipes.txt +++ b/tools/memory-model/Documentation/recipes.txt @@ -322,9 +322,9 @@ the following write-side code fragment: And the xlog_valid_lsn() function in fs/xfs/xfs_log_priv.h contains the corresponding read-side code fragment: - cur_cycle = ACCESS_ONCE(log->l_curr_cycle); + cur_cycle = READ_ONCE(log->l_curr_cycle); smp_rmb(); - cur_block = ACCESS_ONCE(log->l_curr_block); + cur_block = READ_ONCE(log->l_curr_block); Alternatively, consider the following comment in function perf_output_put_handle() in kernel/events/ring_buffer.c: