Merge branch 'master' into for-next

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9ca3e74..0ccd5fc 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" }
@@ -1190,15 +1197,24 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        owned by uid=0.
 
        ima_hash=       [IMA]
-                       Format: { "sha1" | "md5" }
+                       Format: { md5 | sha1 | rmd160 | sha256 | sha384
+                                  | sha512 | ... }
                        default: "sha1"
 
+                       The list of supported hash algorithms is defined
+                       in crypto/hash_info.h.
+
        ima_tcb         [IMA]
                        Load a policy which meets the needs of the Trusted
                        Computing Base.  This means IMA will measure all
                        programs exec'd, files mmap'd for exec, and all files
                        opened for read by uid=0.
 
+       ima_template=   [IMA]
+                       Select one of defined IMA measurements template formats.
+                       Formats: { "ima" | "ima-ng" }
+                       Default: "ima-ng"
+
        init=           [KNL]
                        Format: <full_path>
                        Run specified binary instead of /sbin/init as init