From fe40ad0926065e1b76ba21086822d68fcf38bf7f Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Tue, 29 May 2012 15:06:26 -0700 Subject: [PATCH] --- yaml --- r: 308843 b: refs/heads/master c: eb6332a54542bcd3aedb121ecb247f172b8f3602 h: refs/heads/master i: 308841: 1d405673c2cfd9b4950388a83e1e044bfe9022de 308839: 1e0216aad2ca6877a0652b59d8f82cd371cd13db v: v3 --- [refs] | 2 +- trunk/Documentation/cgroups/memory.txt | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 9791e9b80f3e..78d20a524abb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f60b69d8cabbf7c0daf879cae4d09ac0776f4b4 +refs/heads/master: eb6332a54542bcd3aedb121ecb247f172b8f3602 diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt index 9b1067afb224..e479007f1a75 100644 --- a/trunk/Documentation/cgroups/memory.txt +++ b/trunk/Documentation/cgroups/memory.txt @@ -430,17 +430,10 @@ hierarchical_memory_limit - # of bytes of memory limit with regard to hierarchy hierarchical_memsw_limit - # of bytes of memory+swap limit with regard to hierarchy under which memory cgroup is. -total_cache - sum of all children's "cache" -total_rss - sum of all children's "rss" -total_mapped_file - sum of all children's "cache" -total_pgpgin - sum of all children's "pgpgin" -total_pgpgout - sum of all children's "pgpgout" -total_swap - sum of all children's "swap" -total_inactive_anon - sum of all children's "inactive_anon" -total_active_anon - sum of all children's "active_anon" -total_inactive_file - sum of all children's "inactive_file" -total_active_file - sum of all children's "active_file" -total_unevictable - sum of all children's "unevictable" +total_ - # hierarchical version of , which in + addition to the cgroup's own value includes the + sum of all hierarchical children's values of + , i.e. total_cache # The following additional stats are dependent on CONFIG_DEBUG_VM.