diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2014-12-10 18:42:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 20:41:04 -0500 |
commit | 5b1efc027c0b51ca3e76f4e00c83358f8349f543 (patch) | |
tree | ef12cdcbfb7ac8ad45b66e6ee5e6cf9f2d566418 /Documentation/cgroups/memory.txt | |
parent | 71f87bee38edddb21d97895fa938744cf3f477bb (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.txt | 17 |
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 | ||
117 | 2.1. Design | 117 | 2.1. Design |
118 | 118 | ||
119 | The core of the design is a counter called the res_counter. The res_counter | 119 | The core of the design is a counter called the page_counter. The |
120 | tracks the current memory usage and limit of the group of processes associated | 120 | page_counter tracks the current memory usage and limit of the group of |
121 | with the controller. Each cgroup has a memory controller specific data | 121 | processes associated with the controller. Each cgroup has a memory controller |
122 | structure (mem_cgroup) associated with it. | 122 | specific data structure (mem_cgroup) associated with it. |
123 | 123 | ||
124 | 2.2. Accounting | 124 | 2.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: | |||
352 | 0. Configuration | 352 | 0. Configuration |
353 | 353 | ||
354 | a. Enable CONFIG_CGROUPS | 354 | a. Enable CONFIG_CGROUPS |
355 | b. Enable CONFIG_RESOURCE_COUNTERS | 355 | b. Enable CONFIG_MEMCG |
356 | c. Enable CONFIG_MEMCG | 356 | c. Enable CONFIG_MEMCG_SWAP (to use swap extension) |
357 | d. Enable CONFIG_MEMCG_SWAP (to use swap extension) | ||
358 | d. Enable CONFIG_MEMCG_KMEM (to use kmem extension) | 357 | d. Enable CONFIG_MEMCG_KMEM (to use kmem extension) |
359 | 358 | ||
360 | 1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?) | 359 | 1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?) |