summaryrefslogtreecommitdiff
path: root/Documentation/vm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-03-19 13:12:32 +0000
committerMark Brown <broonie@kernel.org>2019-03-19 13:12:32 +0000
commit249acb5f47df27109d74a0d904a5da56c8bac28f (patch)
treebade04b7c88324eaf6f826dd69a10146edd9a819 /Documentation/vm
parent9384d0e6facc9f5b325a2d401e9ed6bb49507a2a (diff)
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff)
downloadlinux-249acb5f47df27109d74a0d904a5da56c8bac28f.tar.gz
linux-249acb5f47df27109d74a0d904a5da56c8bac28f.tar.bz2
linux-249acb5f47df27109d74a0d904a5da56c8bac28f.zip
Merge tag 'v5.1-rc1' into spi-5.2
Linux 5.1-rc1
Diffstat (limited to 'Documentation/vm')
-rw-r--r--Documentation/vm/index.rst2
-rw-r--r--Documentation/vm/slub.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/vm/index.rst b/Documentation/vm/index.rst
index 2b3ab3a1ccf3..b58cc3bfe777 100644
--- a/Documentation/vm/index.rst
+++ b/Documentation/vm/index.rst
@@ -4,7 +4,7 @@ Linux Memory Management Documentation
This is a collection of documents about the Linux memory management (mm)
subsystem. If you are looking for advice on simply allocating memory,
-see the :ref:`memory-allocation`.
+see the :ref:`memory_allocation`.
User guides for MM features
===========================
diff --git a/Documentation/vm/slub.rst b/Documentation/vm/slub.rst
index 195928808bac..933ada4368ff 100644
--- a/Documentation/vm/slub.rst
+++ b/Documentation/vm/slub.rst
@@ -66,7 +66,7 @@ Trying to find an issue in the dentry cache? Try::
to only enable debugging on the dentry cache. You may use an asterisk at the
end of the slab name, in order to cover all slabs with the same prefix. For
example, here's how you can poison the dentry cache as well as all kmalloc
-slabs:
+slabs::
slub_debug=P,kmalloc-*,dentry
@@ -141,7 +141,7 @@ can be influenced by kernel parameters:
(list_lock) where contention may occur.
``slub_min_order``
- specifies a minim order of slabs. A similar effect like
+ specifies a minimum order of slabs. A similar effect like
``slub_min_objects``.
``slub_max_order``