summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2020-11-20 06:38:53 +0300
committerPaul E. McKenney <paulmck@kernel.org>2020-11-20 06:38:53 +0300
commit50df51d12c3175573de9c94968639bdd625ec549 (patch)
tree6c372ab966a1d88e67545a362ee35288bfa5fa0a /Documentation
parentc4638ff0644bb114b27c65fbc975a1597030beb0 (diff)
parentb6ff30849ca723b78306514246b98ca5645d92f5 (diff)
downloadlinux-50df51d12c3175573de9c94968639bdd625ec549.tar.xz
Merge branch 'lkmm.2020.11.06a' into HEAD
lkmm.2020.11.06a: Linux-kernel memory model (LKMM) updates.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/memory-barriers.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index 17c8e0c2deb4..7367ada13208 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -1870,7 +1870,7 @@ There are some more advanced barrier functions:
These are for use with atomic RMW functions that do not imply memory
barriers, but where the code needs a memory barrier. Examples for atomic
- RMW functions that do not imply are memory barrier are e.g. add,
+ RMW functions that do not imply a memory barrier are e.g. add,
subtract, (failed) conditional operations, _relaxed functions,
but not atomic_read or atomic_set. A common example where a memory
barrier may be required is when atomic ops are used for reference