]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
memcg: clarify use_hierarchy documentation
authorGreg Thelen <gthelen@google.com>
Thu, 17 Feb 2011 01:51:23 +0000 (17:51 -0800)
committerJiri Kosina <jkosina@suse.cz>
Thu, 17 Feb 2011 08:17:21 +0000 (09:17 +0100)
The memcg code does not allow changing memory.use_hierarchy if the
parent cgroup has enabled use_hierarchy.  Update documentation to match
the code.

Signed-off-by: Greg Thelen <gthelen@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Documentation/cgroups/memory.txt

index 7781857dc940ea01d60e7bc0b249cbd15623182d..b6ed61c958560d987e40cc28a9eca7f7d12401a1 100644 (file)
@@ -485,8 +485,9 @@ The feature can be disabled by
 
 # echo 0 > memory.use_hierarchy
 
-NOTE1: Enabling/disabling will fail if the cgroup already has other
-       cgroups created below it.
+NOTE1: Enabling/disabling will fail if either the cgroup already has other
+       cgroups created below it, or if the parent cgroup has use_hierarchy
+       enabled.
 
 NOTE2: When panic_on_oom is set to "2", the whole system will panic in
        case of an OOM event in any cgroup.