Skip to content

Commit

Permalink
cgroups: clean up Kconfig
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Li Zefan authored and Linus Torvalds committed Jan 16, 2009
1 parent a6b2f87 commit 23964d2
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -343,31 +342,33 @@ config CGROUPS

Say N if unsure.

if CGROUPS

config CGROUP_DEBUG
bool "Example debug cgroup subsystem"
depends on CGROUPS
default n
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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 23964d2

Please sign in to comment.