Commit 79ae9c29 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by 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: default avatarDaniel Lezcano <daniel.lezcano@free.fr>
Acked-by: default avatarLi 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8dd2a82c
...@@ -518,7 +518,6 @@ if CGROUPS ...@@ -518,7 +518,6 @@ if CGROUPS
config CGROUP_DEBUG config CGROUP_DEBUG
bool "Example debug cgroup subsystem" bool "Example debug cgroup subsystem"
depends on CGROUPS
default n default n
help help
This option enables a simple cgroup subsystem that This option enables a simple cgroup subsystem that
...@@ -529,7 +528,6 @@ config CGROUP_DEBUG ...@@ -529,7 +528,6 @@ config CGROUP_DEBUG
config CGROUP_NS config CGROUP_NS
bool "Namespace cgroup subsystem" bool "Namespace cgroup subsystem"
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,
...@@ -538,21 +536,19 @@ config CGROUP_NS ...@@ -538,21 +536,19 @@ config CGROUP_NS
config CGROUP_FREEZER config CGROUP_FREEZER
bool "Freezer cgroup subsystem" bool "Freezer cgroup subsystem"
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
bool "Device controller for cgroups" bool "Device controller for cgroups"
depends on CGROUPS && EXPERIMENTAL depends on EXPERIMENTAL
help help
Provides a cgroup implementing whitelists for devices which Provides a cgroup implementing whitelists for devices which
a process in the cgroup can mknod or open. a process in the cgroup can mknod or open.
config CPUSETS config CPUSETS
bool "Cpuset support" bool "Cpuset support"
depends on CGROUPS
help help
This option will let you create and manage CPUSETs which This option will let you create and manage CPUSETs which
allow dynamically partitioning a system into sets of CPUs and allow dynamically partitioning a system into sets of CPUs and
...@@ -568,7 +564,6 @@ config PROC_PID_CPUSET ...@@ -568,7 +564,6 @@ config PROC_PID_CPUSET
config CGROUP_CPUACCT config CGROUP_CPUACCT
bool "Simple CPU accounting cgroup subsystem" bool "Simple CPU accounting cgroup subsystem"
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.
...@@ -578,11 +573,10 @@ config RESOURCE_COUNTERS ...@@ -578,11 +573,10 @@ config 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
config CGROUP_MEM_RES_CTLR config CGROUP_MEM_RES_CTLR
bool "Memory Resource Controller for Control Groups" bool "Memory Resource Controller for Control Groups"
depends on CGROUPS && RESOURCE_COUNTERS depends on RESOURCE_COUNTERS
select MM_OWNER select MM_OWNER
help help
Provides a memory resource controller that manages both anonymous Provides a memory resource controller that manages both anonymous
...@@ -623,7 +617,7 @@ config CGROUP_MEM_RES_CTLR_SWAP ...@@ -623,7 +617,7 @@ config CGROUP_MEM_RES_CTLR_SWAP
menuconfig CGROUP_SCHED menuconfig CGROUP_SCHED
bool "Group CPU scheduler" bool "Group CPU scheduler"
depends on EXPERIMENTAL && CGROUPS depends on EXPERIMENTAL
default n default n
help help
This feature lets CPU scheduler recognize task groups and control CPU This feature lets CPU scheduler recognize task groups and control CPU
...@@ -652,7 +646,7 @@ endif #CGROUP_SCHED ...@@ -652,7 +646,7 @@ endif #CGROUP_SCHED
config BLK_CGROUP config BLK_CGROUP
tristate "Block IO controller" tristate "Block IO controller"
depends on CGROUPS && BLOCK depends on BLOCK
default n default n
---help--- ---help---
Generic block IO controller cgroup interface. This is the common Generic block IO controller cgroup interface. This is the common
......
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