diff options
| author | Greg Thelen <gthelen@google.com> | 2011-02-16 17:51:23 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-17 09:17:21 +0100 |
| commit | 689bca3bbccd41be7b256e2227ff2fd0d7aed4ee (patch) | |
| tree | 0e0dc4331d2d6c673aa95f9bf3cbb050294fb64e /Documentation/cgroups | |
| parent | c23cf8baf6965fc9bcffb62c92b384b0f0c78eb7 (diff) | |
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 <gthelen@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/cgroups')
| -rw-r--r-- | Documentation/cgroups/memory.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 7781857dc94..b6ed61c9585 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. |