mm/slab_common: provide "slab_merge" option for !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT...

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 5c949c1..1c0a3cf 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4996,6 +4996,10 @@
 
        slram=          [HW,MTD]
 
+       slab_merge      [MM]
+                       Enable merging of slabs with similar size when the
+                       kernel is built without CONFIG_SLAB_MERGE_DEFAULT.
+
        slab_nomerge    [MM]
                        Disable merging of slabs with similar size. May be
                        necessary if there is some reason to distinguish
@@ -5043,6 +5047,9 @@
                        lower than slub_max_order.
                        For more information see Documentation/vm/slub.rst.
 
+       slub_merge      [MM, SLUB]
+                       Same with slab_merge.
+
        slub_nomerge    [MM, SLUB]
                        Same with slab_nomerge. This is supported for legacy.
                        See slab_nomerge for more information.