From 689bca3bbccd41be7b256e2227ff2fd0d7aed4ee Mon Sep 17 00:00:00 2001 From: Greg Thelen Date: Wed, 16 Feb 2011 17:51:23 -0800 Subject: [PATCH] memcg: clarify use_hierarchy documentation 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 Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Jiri Kosina --- Documentation/cgroups/memory.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 7781857dc940..b6ed61c95856 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt @@ -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. -- GitLab