diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/init/Kconfig b/init/Kconfig index 5b3a3942a98c..fbc7c1f7af60 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -518,7 +518,6 @@ if CGROUPS | |||
518 | 518 | ||
519 | config CGROUP_DEBUG | 519 | config CGROUP_DEBUG |
520 | bool "Example debug cgroup subsystem" | 520 | bool "Example debug cgroup subsystem" |
521 | depends on CGROUPS | ||
522 | default n | 521 | default n |
523 | help | 522 | help |
524 | This option enables a simple cgroup subsystem that | 523 | This option enables a simple cgroup subsystem that |
@@ -529,7 +528,6 @@ config CGROUP_DEBUG | |||
529 | 528 | ||
530 | config CGROUP_NS | 529 | config CGROUP_NS |
531 | bool "Namespace cgroup subsystem" | 530 | bool "Namespace cgroup subsystem" |
532 | depends on CGROUPS | ||
533 | help | 531 | help |
534 | Provides a simple namespace cgroup subsystem to | 532 | Provides a simple namespace cgroup subsystem to |
535 | provide hierarchical naming of sets of namespaces, | 533 | provide hierarchical naming of sets of namespaces, |
@@ -538,21 +536,19 @@ config CGROUP_NS | |||
538 | 536 | ||
539 | config CGROUP_FREEZER | 537 | config CGROUP_FREEZER |
540 | bool "Freezer cgroup subsystem" | 538 | bool "Freezer cgroup subsystem" |
541 | depends on CGROUPS | ||
542 | help | 539 | help |
543 | Provides a way to freeze and unfreeze all tasks in a | 540 | Provides a way to freeze and unfreeze all tasks in a |
544 | cgroup. | 541 | cgroup. |
545 | 542 | ||
546 | config CGROUP_DEVICE | 543 | config CGROUP_DEVICE |
547 | bool "Device controller for cgroups" | 544 | bool "Device controller for cgroups" |
548 | depends on CGROUPS && EXPERIMENTAL | 545 | depends on EXPERIMENTAL |
549 | help | 546 | help |
550 | Provides a cgroup implementing whitelists for devices which | 547 | Provides a cgroup implementing whitelists for devices which |
551 | a process in the cgroup can mknod or open. | 548 | a process in the cgroup can mknod or open. |
552 | 549 | ||
553 | config CPUSETS | 550 | config CPUSETS |
554 | bool "Cpuset support" | 551 | bool "Cpuset support" |
555 | depends on CGROUPS | ||
556 | help | 552 | help |
557 | This option will let you create and manage CPUSETs which | 553 | This option will let you create and manage CPUSETs which |
558 | allow dynamically partitioning a system into sets of CPUs and | 554 | allow dynamically partitioning a system into sets of CPUs and |
@@ -568,7 +564,6 @@ config PROC_PID_CPUSET | |||
568 | 564 | ||
569 | config CGROUP_CPUACCT | 565 | config CGROUP_CPUACCT |
570 | bool "Simple CPU accounting cgroup subsystem" | 566 | bool "Simple CPU accounting cgroup subsystem" |
571 | depends on CGROUPS | ||
572 | help | 567 | help |
573 | Provides a simple Resource Controller for monitoring the | 568 | Provides a simple Resource Controller for monitoring the |
574 | total CPU consumed by the tasks in a cgroup. | 569 | total CPU consumed by the tasks in a cgroup. |
@@ -578,11 +573,10 @@ config RESOURCE_COUNTERS | |||
578 | help | 573 | help |
579 | This option enables controller independent resource accounting | 574 | This option enables controller independent resource accounting |
580 | infrastructure that works with cgroups. | 575 | infrastructure that works with cgroups. |
581 | depends on CGROUPS | ||
582 | 576 | ||
583 | config CGROUP_MEM_RES_CTLR | 577 | config CGROUP_MEM_RES_CTLR |
584 | bool "Memory Resource Controller for Control Groups" | 578 | bool "Memory Resource Controller for Control Groups" |
585 | depends on CGROUPS && RESOURCE_COUNTERS | 579 | depends on RESOURCE_COUNTERS |
586 | select MM_OWNER | 580 | select MM_OWNER |
587 | help | 581 | help |
588 | Provides a memory resource controller that manages both anonymous | 582 | Provides a memory resource controller that manages both anonymous |
@@ -623,7 +617,7 @@ config CGROUP_MEM_RES_CTLR_SWAP | |||
623 | 617 | ||
624 | menuconfig CGROUP_SCHED | 618 | menuconfig CGROUP_SCHED |
625 | bool "Group CPU scheduler" | 619 | bool "Group CPU scheduler" |
626 | depends on EXPERIMENTAL && CGROUPS | 620 | depends on EXPERIMENTAL |
627 | default n | 621 | default n |
628 | help | 622 | help |
629 | This feature lets CPU scheduler recognize task groups and control CPU | 623 | This feature lets CPU scheduler recognize task groups and control CPU |
@@ -652,7 +646,7 @@ endif #CGROUP_SCHED | |||
652 | 646 | ||
653 | config BLK_CGROUP | 647 | config BLK_CGROUP |
654 | tristate "Block IO controller" | 648 | tristate "Block IO controller" |
655 | depends on CGROUPS && BLOCK | 649 | depends on BLOCK |
656 | default n | 650 | default n |
657 | ---help--- | 651 | ---help--- |
658 | Generic block IO controller cgroup interface. This is the common | 652 | Generic block IO controller cgroup interface. This is the common |