Commit 23964d2d authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds

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: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarPaul Menage <menage@google.com>
Acked-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6b2f87b
...@@ -328,11 +328,10 @@ config CGROUP_SCHED ...@@ -328,11 +328,10 @@ config CGROUP_SCHED
endchoice endchoice
menu "Control Group support" menuconfig CGROUPS
config CGROUPS boolean "Control Group support"
bool "Control Group support"
help 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 use with process control subsystems such as Cpusets, CFS, memory
controls or device isolation. controls or device isolation.
See See
...@@ -343,6 +342,8 @@ config CGROUPS ...@@ -343,6 +342,8 @@ config CGROUPS
Say N if unsure. Say N if unsure.
if CGROUPS
config CGROUP_DEBUG config CGROUP_DEBUG
bool "Example debug cgroup subsystem" bool "Example debug cgroup subsystem"
depends on CGROUPS depends on CGROUPS
...@@ -350,24 +351,24 @@ config CGROUP_DEBUG ...@@ -350,24 +351,24 @@ config CGROUP_DEBUG
help help
This option enables a simple cgroup subsystem that This option enables a simple cgroup subsystem that
exports useful debugging information about the cgroups exports useful debugging information about the cgroups
framework framework.
Say N if unsure Say N if unsure.
config CGROUP_NS config CGROUP_NS
bool "Namespace cgroup subsystem" bool "Namespace cgroup subsystem"
depends on CGROUPS depends on CGROUPS
help help
Provides a simple namespace cgroup subsystem to Provides a simple namespace cgroup subsystem to
provide hierarchical naming of sets of namespaces, provide hierarchical naming of sets of namespaces,
for instance virtual servers and checkpoint/restart for instance virtual servers and checkpoint/restart
jobs. jobs.
config CGROUP_FREEZER config CGROUP_FREEZER
bool "control group freezer subsystem" bool "Freezer cgroup subsystem"
depends on CGROUPS depends on CGROUPS
help help
Provides a way to freeze and unfreeze all tasks in a Provides a way to freeze and unfreeze all tasks in a
cgroup. cgroup.
config CGROUP_DEVICE config CGROUP_DEVICE
...@@ -388,18 +389,23 @@ config CPUSETS ...@@ -388,18 +389,23 @@ config CPUSETS
Say N if unsure. Say N if unsure.
config PROC_PID_CPUSET
bool "Include legacy /proc/<pid>/cpuset file"
depends on CPUSETS
default y
config CGROUP_CPUACCT config CGROUP_CPUACCT
bool "Simple CPU accounting cgroup subsystem" bool "Simple CPU accounting cgroup subsystem"
depends on CGROUPS depends on CGROUPS
help help
Provides a simple Resource Controller for monitoring the 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 config RESOURCE_COUNTERS
bool "Resource counters" bool "Resource counters"
help help
This option enables controller independent resource accounting This option enables controller independent resource accounting
infrastructure that works with cgroups infrastructure that works with cgroups.
depends on CGROUPS depends on CGROUPS
config CGROUP_MEM_RES_CTLR config CGROUP_MEM_RES_CTLR
...@@ -425,9 +431,6 @@ config CGROUP_MEM_RES_CTLR ...@@ -425,9 +431,6 @@ config CGROUP_MEM_RES_CTLR
This config option also selects MM_OWNER config option, which This config option also selects MM_OWNER config option, which
could in turn add some fork/exit overhead. could in turn add some fork/exit overhead.
config MM_OWNER
bool
config CGROUP_MEM_RES_CTLR_SWAP config CGROUP_MEM_RES_CTLR_SWAP
bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)" bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
...@@ -444,8 +447,10 @@ config CGROUP_MEM_RES_CTLR_SWAP ...@@ -444,8 +447,10 @@ config CGROUP_MEM_RES_CTLR_SWAP
there will be no overhead from this. Even when you set this config=y, 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. if boot option "noswapaccount" is set, swap will not be accounted.
endif # CGROUPS
endmenu config MM_OWNER
bool
config SYSFS_DEPRECATED config SYSFS_DEPRECATED
bool bool
...@@ -483,11 +488,6 @@ config SYSFS_DEPRECATED_V2 ...@@ -483,11 +488,6 @@ config SYSFS_DEPRECATED_V2
if the original kernel, that came with your distribution, has if the original kernel, that came with your distribution, has
this option set to N. this option set to N.
config PROC_PID_CPUSET
bool "Include legacy /proc/<pid>/cpuset file"
depends on CPUSETS
default y
config RELAY config RELAY
bool "Kernel->user space relay support (formerly relayfs)" bool "Kernel->user space relay support (formerly relayfs)"
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment