Merge branch 'lkmm.2021.05.10c' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

da803f82 · Linus Torvalds <[email protected]> · 2021-07-04 12:33:31 -07:00

Pull lkmm fixlet from Paul E McKenney.

Fix missing underscore in Linux-kernel memory model docs.

* 'lkmm.2021.05.10c' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
  tools/memory-model: Fix smp_mb__after_spinlock() spelling

Commit: da803f82faa5ceeff34aa56c08ceba5384e44e47
Parents: b97efd5e · d25fba0e

Merge commit. Changes below are compared with the first parent: b97efd5e.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
tools/memory-model/Documentation/explanation.txt	modified	+1	−1	View file

tools/memory-model/Documentation/explanation.txt

View file

diff --git a/tools/memory-model/Documentation/explanation.txt b/tools/memory-model/Documentation/explanation.txt
index f9d610d..5d72f31 100644
--- a/tools/memory-model/Documentation/explanation.txt
+++ b/tools/memory-model/Documentation/explanation.txt
@@ -2510,7 +2510,7 @@ they behave as follows:
 	smp_mb__after_atomic() orders po-earlier atomic updates and
 	the events preceding them against all po-later events;
 
-	smp_mb_after_spinlock() orders po-earlier lock acquisition
+	smp_mb__after_spinlock() orders po-earlier lock acquisition
 	events and the events preceding them against all po-later
 	events.
 