Skip to content

Commit

Permalink
memcg: clarify use_hierarchy documentation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gthelen authored and Jiri Kosina committed Feb 17, 2011
1 parent c23cf8b commit 689bca3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/cgroups/memory.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 689bca3

Please sign in to comment.