提交 79ae9c29 编写于 作者: D Daniel Lezcano 提交者: Linus Torvalds

namespaces Kconfig: remove pointless cgroup dependency

The different cgroup subsystems are under the cgroup submenu.  The
dependency between the cgroups and the menu subsystems is pointless.
Signed-off-by: NDaniel Lezcano <daniel.lezcano@free.fr>
Acked-by: NLi Zefan <lizf@cn.fujitsu.com>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 8dd2a82c
......@@ -518,7 +518,6 @@ if CGROUPS
config CGROUP_DEBUG
bool "Example debug cgroup subsystem"
depends on CGROUPS
default n
help
This option enables a simple cgroup subsystem that
......@@ -529,7 +528,6 @@ config CGROUP_DEBUG
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,
......@@ -538,21 +536,19 @@ config CGROUP_NS
config CGROUP_FREEZER
bool "Freezer cgroup subsystem"
depends on CGROUPS
help
Provides a way to freeze and unfreeze all tasks in a
cgroup.
config CGROUP_DEVICE
bool "Device controller for cgroups"
depends on CGROUPS && EXPERIMENTAL
depends on EXPERIMENTAL
help
Provides a cgroup implementing whitelists for devices which
a process in the cgroup can mknod or open.
config CPUSETS
bool "Cpuset support"
depends on CGROUPS
help
This option will let you create and manage CPUSETs which
allow dynamically partitioning a system into sets of CPUs and
......@@ -568,7 +564,6 @@ config PROC_PID_CPUSET
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.
......@@ -578,11 +573,10 @@ config RESOURCE_COUNTERS
help
This option enables controller independent resource accounting
infrastructure that works with cgroups.
depends on CGROUPS
config CGROUP_MEM_RES_CTLR
bool "Memory Resource Controller for Control Groups"
depends on CGROUPS && RESOURCE_COUNTERS
depends on RESOURCE_COUNTERS
select MM_OWNER
help
Provides a memory resource controller that manages both anonymous
......@@ -623,7 +617,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
menuconfig CGROUP_SCHED
bool "Group CPU scheduler"
depends on EXPERIMENTAL && CGROUPS
depends on EXPERIMENTAL
default n
help
This feature lets CPU scheduler recognize task groups and control CPU
......@@ -652,7 +646,7 @@ endif #CGROUP_SCHED
config BLK_CGROUP
tristate "Block IO controller"
depends on CGROUPS && BLOCK
depends on BLOCK
default n
---help---
Generic block IO controller cgroup interface. This is the common
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册