summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-07-04 12:33:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-07-04 12:33:31 -0700
commitda803f82faa5ceeff34aa56c08ceba5384e44e47 (patch)
tree45c2190636e7c4781a1d465f32a5f9709490f2ed
parentb97efd5e98106e1198884c13762ef03637605f87 (diff)
parentd25fba0e34742f19b5ca307c60c4d260ca5a754a (diff)
Merge branch 'lkmm.2021.05.10c' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
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
-rw-r--r--tools/memory-model/Documentation/explanation.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/memory-model/Documentation/explanation.txt b/tools/memory-model/Documentation/explanation.txt
index f9d610d5a1a4..5d72f3112e56 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.