Andrew, could you queue this one please? On Fri 02-05-14 11:43:51, Michal Hocko wrote: [...] > From 30b9505169e574cdb553226e1a361cc527ed492b Mon Sep 17 00:00:00 2001 > From: Michal Hocko <mhocko@xxxxxxx> > Date: Fri, 2 May 2014 11:42:35 +0200 > Subject: [PATCH] mmotm: memcg-doc-clarify-global-vs-limit-reclaims-fix.patch > > update doc as per Johannes > > Signed-off-by: Michal Hocko <mhocko@xxxxxxx> > --- > Documentation/cgroups/memory.txt | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt > index add1be001416..2cde96787ceb 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 > -- > 2.0.0.rc0 > > -- > Michal Hocko > SUSE Labs > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@xxxxxxxxx. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a> -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>