summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2014-05-22 10:54:35 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-05-27 18:24:32 +1000
commitd515d645f51fe6f9bba6a1305ebb07dc2e429667 (patch)
treeee8736c1506e7ee8b28c58ccd96451c14be25695
parent757df1a37b022058bca5982ee2bfd07899fc9ac4 (diff)
memcg-doc-clarify-global-vs-limit-reclaims-fix
update doc as per Johannes Signed-off-by: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Greg Thelen <gthelen@google.com> Cc: Michel Lespinasse <walken@google.com> Cc: Tejun Heo <tj@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Roman Gushchin <klamm@yandex-team.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--Documentation/cgroups/memory.txt10
1 files changed, 1 insertions, 9 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index 5ba92acc0e25..1e5f666b6df2 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -241,17 +241,9 @@ global VM. Cgroups can get reclaimed basically under two conditions
proportionally wrt. their LRU size in a round robin fashion
- when a cgroup or its hierarchical parent (see 6. Hierarchical support)
hits hard limit. If the reclaim is unsuccessful, an OOM routine is invoked
- to select and kill the bulkiest task in the cgroup. (See 10. OOM Control
+ to select and kill the bulkiest task in the hiearchy. (See 10. OOM Control
below.)
-Global and hard-limit reclaims share the same code the only difference
-is the objective of the reclaim. The global reclaim aims at balancing
-zones' watermarks while the limit reclaim frees some memory to allow new
-charges.
-
-NOTE: Hard limit reclaim does not work for the root cgroup, since we cannot set
-any limits on the root cgroup.
-
Note2: When panic_on_oom is set to "2", the whole system will panic.
When oom event notifier is registered, event will be delivered to the root