summaryrefslogtreecommitdiffstats
path: root/Documentation/vm/locking
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-08-17 16:14:01 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-08-17 16:14:01 +0000
commit94bd217e2d683719ab21a4ac117d8a1b91cbedc9 (patch)
treef2d506818cc1643ca816f609518ab5d1cdb28e66 /Documentation/vm/locking
parent5dd72f12df00cbabc16de770b79b17ced63138be (diff)
parent93ee7a9340d64f20295aacc3fb6a22b759323280 (diff)
Merge commit 'v3.1-rc2' into HEAD
Diffstat (limited to 'Documentation/vm/locking')
-rw-r--r--Documentation/vm/locking2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vm/locking b/Documentation/vm/locking
index 25fadb44876..f61228bd639 100644
--- a/Documentation/vm/locking
+++ b/Documentation/vm/locking
@@ -66,7 +66,7 @@ in some cases it is not really needed. Eg, vm_start is modified by
expand_stack(), it is hard to come up with a destructive scenario without
having the vmlist protection in this case.
-The page_table_lock nests with the inode i_mmap_lock and the kmem cache
+The page_table_lock nests with the inode i_mmap_mutex and the kmem cache
c_spinlock spinlocks. This is okay, since the kmem code asks for pages after
dropping c_spinlock. The page_table_lock also nests with pagecache_lock and
pagemap_lru_lock spinlocks, and no code asks for memory with these locks