summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-01-15 13:50:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-15 16:39:37 -0800
commit23964d2d02984d44aeb2d84d7ffb3359e728df43 (patch)
treec84ac4fd111df4277d7a2c6ee7fc8fd503156c0f /init
parenta6b2f87be1aafedc585bad86b77c2e2bbd49b308 (diff)
downloadlinux-stable-23964d2d02984d44aeb2d84d7ffb3359e728df43.tar.gz
linux-stable-23964d2d02984d44aeb2d84d7ffb3359e728df43.tar.bz2
linux-stable-23964d2d02984d44aeb2d84d7ffb3359e728df43.zip
cgroups: clean up Kconfig
- move CONFIG_PROC_PID_CPUSET into cgroup menu - move MM_OWNER to the bottom for better menu indent - fix typos - use tabs not spaces Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Paul Menage <menage@google.com> Acked-by: Balbir Singh <balbir@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')
-rw-r--r--init/Kconfig56
1 files changed, 28 insertions, 28 deletions
diff --git a/init/Kconfig b/init/Kconfig
index a724a149bf3f..56fd93c63c77 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -328,11 +328,10 @@ config CGROUP_SCHED
endchoice
-menu "Control Group support"
-config CGROUPS
- bool "Control Group support"
+menuconfig CGROUPS
+ boolean "Control Group support"
help
- This option add support for grouping sets of processes together, for
+ This option adds support for grouping sets of processes together, for
use with process control subsystems such as Cpusets, CFS, memory
controls or device isolation.
See
@@ -343,6 +342,8 @@ config CGROUPS
Say N if unsure.
+if CGROUPS
+
config CGROUP_DEBUG
bool "Example debug cgroup subsystem"
depends on CGROUPS
@@ -350,24 +351,24 @@ config CGROUP_DEBUG
help
This option enables a simple cgroup subsystem that
exports useful debugging information about the cgroups
- framework
+ framework.
- Say N if unsure
+ Say N if unsure.
config CGROUP_NS
- bool "Namespace cgroup subsystem"
- depends on CGROUPS
- help
- Provides a simple namespace cgroup subsystem to
- provide hierarchical naming of sets of namespaces,
- for instance virtual servers and checkpoint/restart
- jobs.
+ bool "Namespace cgroup subsystem"
+ depends on CGROUPS
+ help
+ Provides a simple namespace cgroup subsystem to
+ provide hierarchical naming of sets of namespaces,
+ for instance virtual servers and checkpoint/restart
+ jobs.
config CGROUP_FREEZER
- bool "control group freezer subsystem"
- depends on CGROUPS
- help
- Provides a way to freeze and unfreeze all tasks in a
+ bool "Freezer cgroup subsystem"
+ depends on CGROUPS
+ help
+ Provides a way to freeze and unfreeze all tasks in a
cgroup.
config CGROUP_DEVICE
@@ -388,18 +389,23 @@ config CPUSETS
Say N if unsure.
+config PROC_PID_CPUSET
+ bool "Include legacy /proc/<pid>/cpuset file"
+ depends on CPUSETS
+ default y
+
config CGROUP_CPUACCT
bool "Simple CPU accounting cgroup subsystem"
depends on CGROUPS
help
Provides a simple Resource Controller for monitoring the
- total CPU consumed by the tasks in a cgroup
+ total CPU consumed by the tasks in a cgroup.
config RESOURCE_COUNTERS
bool "Resource counters"
help
This option enables controller independent resource accounting
- infrastructure that works with cgroups
+ infrastructure that works with cgroups.
depends on CGROUPS
config CGROUP_MEM_RES_CTLR
@@ -425,9 +431,6 @@ config CGROUP_MEM_RES_CTLR
This config option also selects MM_OWNER config option, which
could in turn add some fork/exit overhead.
-config MM_OWNER
- bool
-
config CGROUP_MEM_RES_CTLR_SWAP
bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
@@ -444,8 +447,10 @@ config CGROUP_MEM_RES_CTLR_SWAP
there will be no overhead from this. Even when you set this config=y,
if boot option "noswapaccount" is set, swap will not be accounted.
+endif # CGROUPS
-endmenu
+config MM_OWNER
+ bool
config SYSFS_DEPRECATED
bool
@@ -483,11 +488,6 @@ config SYSFS_DEPRECATED_V2
if the original kernel, that came with your distribution, has
this option set to N.
-config PROC_PID_CPUSET
- bool "Include legacy /proc/<pid>/cpuset file"
- depends on CPUSETS
- default y
-
config RELAY
bool "Kernel->user space relay support (formerly relayfs)"
help