summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorSylvain Trias <bozo@nobodix.org>2015-04-08 10:27:57 +0200
committerJonathan Corbet <corbet@lwn.net>2015-04-08 22:23:48 +0200
commit7a4580075d37d334b40f510cab54008d2dc66827 (patch)
tree1db7ed0ebb7be47a7a1cdabebb66c77e42813e8e /Documentation
parentdoc: Add guest_nice column to example output of `cat /proc/stat' (diff)
downloadlinux-7a4580075d37d334b40f510cab54008d2dc66827.tar.xz
linux-7a4580075d37d334b40f510cab54008d2dc66827.zip
Documentation/memory-barriers.txt: typo fix
Fix an obvious typo in the documentation. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
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 ca2387ef27ab..a3a94ff71a77 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -1711,7 +1711,7 @@ There are some more advanced barrier functions:
}
The dma_rmb() allows us guarantee the device has released ownership
- before we read the data from the descriptor, and he dma_wmb() allows
+ before we read the data from the descriptor, and the dma_wmb() allows
us to guarantee the data is written to the descriptor before the device
can see it now has ownership. The wmb() is needed to guarantee that the
cache coherent memory writes have completed before attempting a write to