aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/cgroups/memory.txt
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2014-12-10 18:42:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 20:41:04 -0500
commit5b1efc027c0b51ca3e76f4e00c83358f8349f543 (patch)
treeef12cdcbfb7ac8ad45b66e6ee5e6cf9f2d566418 /Documentation/cgroups/memory.txt
parent71f87bee38edddb21d97895fa938744cf3f477bb (diff)
kernel: res_counter: remove the unused API
All memory accounting and limiting has been switched over to the lockless page counters. Bye, res_counter! [akpm@linux-foundation.org: update Documentation/cgroups/memory.txt] [mhocko@suse.cz: ditch the last remainings of res_counter] Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Vladimir Davydov <vdavydov@parallels.com> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: Tejun Heo <tj@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/cgroups/memory.txt')
-rw-r--r--Documentation/cgroups/memory.txt17
1 files changed, 8 insertions, 9 deletions
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index f624727ab404..67613ff0270c 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -116,16 +116,16 @@ The memory controller is the first controller developed.
116 116
1172.1. Design 1172.1. Design
118 118
119The core of the design is a counter called the res_counter. The res_counter 119The core of the design is a counter called the page_counter. The
120tracks the current memory usage and limit of the group of processes associated 120page_counter tracks the current memory usage and limit of the group of
121with the controller. Each cgroup has a memory controller specific data 121processes associated with the controller. Each cgroup has a memory controller
122structure (mem_cgroup) associated with it. 122specific data structure (mem_cgroup) associated with it.
123 123
1242.2. Accounting 1242.2. Accounting
125 125
126 +--------------------+ 126 +--------------------+
127 | mem_cgroup | 127 | mem_cgroup |
128 | (res_counter) | 128 | (page_counter) |
129 +--------------------+ 129 +--------------------+
130 / ^ \ 130 / ^ \
131 / | \ 131 / | \
@@ -352,9 +352,8 @@ set:
3520. Configuration 3520. Configuration
353 353
354a. Enable CONFIG_CGROUPS 354a. Enable CONFIG_CGROUPS
355b. Enable CONFIG_RESOURCE_COUNTERS 355b. Enable CONFIG_MEMCG
356c. Enable CONFIG_MEMCG 356c. Enable CONFIG_MEMCG_SWAP (to use swap extension)
357d. Enable CONFIG_MEMCG_SWAP (to use swap extension)
358d. Enable CONFIG_MEMCG_KMEM (to use kmem extension) 357d. Enable CONFIG_MEMCG_KMEM (to use kmem extension)
359 358
3601. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?) 3591. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?)