diff options
| author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-03-04 17:28:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 19:35:12 -0500 |
| commit | 00f0b8259e48979c37212995d798f3fbd0374690 (patch) | |
| tree | 589e8250c016450324e0c730139d020cf2bf887c /include/linux/cgroup_subsys.h | |
| parent | 804defea1c020d5c52985685e56986f1a399acde (diff) | |
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 'include/linux/cgroup_subsys.h')
| -rw-r--r-- | include/linux/cgroup_subsys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index ac6aad98b607..1ddebfc52565 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h | |||
| @@ -37,7 +37,7 @@ SUBSYS(cpuacct) | |||
| 37 | 37 | ||
| 38 | /* */ | 38 | /* */ |
| 39 | 39 | ||
| 40 | #ifdef CONFIG_CGROUP_MEM_CONT | 40 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR |
| 41 | SUBSYS(mem_cgroup) | 41 | SUBSYS(mem_cgroup) |
| 42 | #endif | 42 | #endif |
| 43 | 43 | ||