diff options
author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-02-07 03:13:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:18 -0500 |
commit | 8cdea7c05454260c0d4d83503949c358eb131d17 (patch) | |
tree | 62f8d7262744dd9ec507252bf3e84a89c088ff9b /init/Kconfig | |
parent | e552b6617067ab785256dcec5ca29eeea981aacb (diff) |
Memory controller: cgroups setup
Setup the memory cgroup and add basic hooks and controls to integrate
and work with the cgroup.
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Paul Menage <menage@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Kirill Korotaev <dev@sw.ru>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: David Rientjes <rientjes@google.com>
Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index d372bd616b0c..95ac2657b0f4 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -397,6 +397,13 @@ config SYSFS_DEPRECATED | |||
397 | If you are using a distro that was released in 2006 or later, | 397 | If you are using a distro that was released in 2006 or later, |
398 | it should be safe to say N here. | 398 | it should be safe to say N here. |
399 | 399 | ||
400 | config CGROUP_MEM_CONT | ||
401 | bool "Memory controller for cgroups" | ||
402 | depends on CGROUPS && RESOURCE_COUNTERS | ||
403 | help | ||
404 | Provides a memory controller that manages both page cache and | ||
405 | RSS memory. | ||
406 | |||
400 | config PROC_PID_CPUSET | 407 | config PROC_PID_CPUSET |
401 | bool "Include legacy /proc/<pid>/cpuset file" | 408 | bool "Include legacy /proc/<pid>/cpuset file" |
402 | depends on CPUSETS | 409 | depends on CPUSETS |