1 files changed, 11 insertions, 6 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index cc4ab2517abc..41f7ec1fcf61 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -656,7 +656,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         Sets the size of kernel global memory area for
                         contiguous memory allocations and optionally the
                         placement constraint by the physical address range of
-                        memory allocations. For more information, see
+                        memory allocations. A value of 0 disables CMA
+                        altogether. For more information, see
                         include/linux/dma-contiguous.h
 
         cmo_free_hint=  [PPC] Format: { yes | no }
@@ -3158,6 +3159,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         slram=          [HW,MTD]
 
+        slab_nomerge    [MM]
+                        Disable merging of slabs with similar size. May be
+                        necessary if there is some reason to distinguish
+                        allocs to different slabs. Debug options disable
+                        merging on their own.
+                        For more information see Documentation/vm/slub.txt.
+
         slab_max_order= [MM, SLAB]
                         Determines the maximum allowed order for slabs.
                         A high setting may cause OOMs due to memory
@@ -3193,11 +3201,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         For more information see Documentation/vm/slub.txt.
 
         slub_nomerge    [MM, SLUB]
-                        Disable merging of slabs with similar size. May be
-                        necessary if there is some reason to distinguish
-                        allocs to different slabs. Debug options disable
-                        merging on their own.
-                        For more information see Documentation/vm/slub.txt.
+                        Same with slab_nomerge. This is supported for legacy.
+                        See slab_nomerge for more information.
 
         smart2=         [HW]
                         Format: <io1>[,<io2>[,...,<io8>]]