aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/cgroup_subsys.h
diff options
context:
space:
mode:
authorBalbir Singh <balbir@linux.vnet.ibm.com>2008-03-04 14:28:39 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 16:35:12 -0800
commit00f0b8259e48979c37212995d798f3fbd0374690 (patch)
tree589e8250c016450324e0c730139d020cf2bf887c /include/linux/cgroup_subsys.h
parent804defea1c020d5c52985685e56986f1a399acde (diff)
downloadkernel_goldelico_gta04-00f0b8259e48979c37212995d798f3fbd0374690.zip
kernel_goldelico_gta04-00f0b8259e48979c37212995d798f3fbd0374690.tar.gz
kernel_goldelico_gta04-00f0b8259e48979c37212995d798f3fbd0374690.tar.bz2
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index ac6aad9..1ddebfc 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -37,7 +37,7 @@ SUBSYS(cpuacct)
/* */
-#ifdef CONFIG_CGROUP_MEM_CONT
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
SUBSYS(mem_cgroup)
#endif