Skip to content

Commit 5517a2e

Browse files
committed
Merge tag 'lkmm.2022.12.02a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull kernel memory model documentation updates from Paul McKenney: - Update the LKMM documentation, both in English and in Korean * tag 'lkmm.2022.12.02a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu: docs/memory-barriers.txt/kokr: Fix confusing name of 'data dependency barrier' docs/memory-barriers.txt/kokr: Add memory barrier dma_mb() docs/memory-barriers.txt/kokr: introduce io_stop_wc() and add implementation for ARM64 docs/memory-barriers.txt: Add a missed closing parenthesis tools/memory-model: Weaken ctrl dependency definition in explanation.txt
2 parents 1fab45a + ee5a86f commit 5517a2e

File tree

3 files changed

+90
-68
lines changed

3 files changed

+90
-68
lines changed

Documentation/memory-barriers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1966,7 +1966,7 @@ There are some more advanced barrier functions:
19661966
(*) io_stop_wc();
19671967

19681968
For memory accesses with write-combining attributes (e.g. those returned
1969-
by ioremap_wc(), the CPU may wait for prior accesses to be merged with
1969+
by ioremap_wc()), the CPU may wait for prior accesses to be merged with
19701970
subsequent ones. io_stop_wc() can be used to prevent the merging of
19711971
write-combining memory accesses before this macro with those after it when
19721972
such wait has performance implications.

0 commit comments

Comments
 (0)