Skip to content

Commit

Permalink
namespaces Kconfig: remove pointless cgroup dependency
Browse files Browse the repository at this point in the history
The different cgroup subsystems are under the cgroup submenu.  The
dependency between the cgroups and the menu subsystems is pointless.

Signed-off-by: Daniel Lezcano <[email protected]>
Acked-by: Li Zefan <[email protected]>
Cc: "Serge E. Hallyn" <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: Paul Menage <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
dlezcano authored and torvalds committed Oct 28, 2010
1 parent 8dd2a82 commit 79ae9c2
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 79ae9c2

Please sign in to comment.