diff options
| author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-03-04 23:28:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 01:35:12 +0100 |
| commit | 00f0b8259e48979c37212995d798f3fbd0374690 (patch) | |
| tree | 589e8250c016450324e0c730139d020cf2bf887c /Documentation/controllers | |
| parent | Kprobes: move kprobe examples to samples/ (diff) | |
| download | linux-00f0b8259e48979c37212995d798f3fbd0374690.tar.xz linux-00f0b8259e48979c37212995d798f3fbd0374690.zip | |
Memory controller: rename to Memory Resource Controller
Rename Memory Controller to Memory Resource Controller. Reflect the same
changes in the CONFIG definition for the Memory Resource Controller. Group
together the config options for Resource Counters and Memory Resource
Controller.
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/controllers')
| -rw-r--r-- | Documentation/controllers/memory.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/controllers/memory.txt b/Documentation/controllers/memory.txt index fba6af45225c..866b9cd9a959 100644 --- a/Documentation/controllers/memory.txt +++ b/Documentation/controllers/memory.txt @@ -1,4 +1,8 @@ -Memory Controller +Memory Resource Controller + +NOTE: The Memory Resource Controller has been generically been referred +to as the memory controller in this document. Do not confuse memory controller +used here with the memory controller that is used in hardware. Salient features @@ -152,7 +156,7 @@ The memory controller uses the following hierarchy a. Enable CONFIG_CGROUPS b. Enable CONFIG_RESOURCE_COUNTERS -c. Enable CONFIG_CGROUP_MEM_CONT +c. Enable CONFIG_CGROUP_MEM_RES_CTLR 1. Prepare the cgroups # mkdir -p /cgroups |