Merge branch 'master' into for-next

[linux-drm-fsl-dcu.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 50680a59a2ff9a913e449a1d71ced9fab3004fe4..0ccd5fc038b1ccb4c3ab25893ead61c41070043d 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -515,7 +515,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        cgroup_disable= [KNL] Disable a particular controller
                        Format: {name of the controller(s) to disable}
-                               {Currently supported controllers - "memory"}
+                       The effects of cgroup_disable=foo are:
+                       - foo isn't auto-mounted if you mount all cgroups in
+                         a single hierarchy
+                       - foo isn't visible as an individually mountable
+                         subsystem
+                       {Currently only "memory" controller deal with this and
+                       cut the overhead, others just disable the usage. So
+                       only cgroup_disable=memory is actually worthy}
 
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }