bonding: document undocumented active_slave sysfs entry.

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index d62778390e5556af22a95cc61d6b5e0cdeeb262e..b8930d5a8325fc0557ddb8649e16d7c8d7c68f21 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -391,7 +391,7 @@ config TREE_RCU
 
 config TREE_PREEMPT_RCU
        bool "Preemptible tree-based hierarchical RCU"
 
 config TREE_PREEMPT_RCU
        bool "Preemptible tree-based hierarchical RCU"

-       depends on PREEMPT
+       depends on PREEMPT && SMP

        help
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or
        help
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or


@@ -401,7 +401,7 @@ config TREE_PREEMPT_RCU
 
 config TINY_RCU
        bool "UP-only small-memory-footprint RCU"
 
 config TINY_RCU
        bool "UP-only small-memory-footprint RCU"

-       depends on !SMP
+       depends on !PREEMPT && !SMP

        help
          This option selects the RCU implementation that is
          designed for UP systems from which real-time response
        help
          This option selects the RCU implementation that is
          designed for UP systems from which real-time response


@@ -410,7 +410,7 @@ config TINY_RCU
 
 config TINY_PREEMPT_RCU
        bool "Preemptible UP-only small-memory-footprint RCU"
 
 config TINY_PREEMPT_RCU
        bool "Preemptible UP-only small-memory-footprint RCU"

-       depends on !SMP && PREEMPT
+       depends on PREEMPT && !SMP

        help
          This option selects the RCU implementation that is designed
          for real-time UP systems.  This option greatly reduces the
        help
          This option selects the RCU implementation that is designed
          for real-time UP systems.  This option greatly reduces the


@@ -689,6 +689,17 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
          For those who want to have the feature enabled by default should
          select this option (if, for some reason, they need to disable it
          then swapaccount=0 does the trick).
          For those who want to have the feature enabled by default should
          select this option (if, for some reason, they need to disable it
          then swapaccount=0 does the trick).

+config CGROUP_MEM_RES_CTLR_KMEM
+       bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
+       depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL
+       default n
+       help
+         The Kernel Memory extension for Memory Resource Controller can limit
+         the amount of memory used by kernel objects in the system. Those are
+         fundamentally different from the entities handled by the standard
+         Memory Controller, which are page-based, and can be swapped. Users of
+         the kmem extension can use it to guarantee that no group of processes
+         will ever exhaust kernel resources alone.

 
 config CGROUP_PERF
        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
 
 config CGROUP_PERF
        bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"


@@ -715,6 +726,18 @@ config FAIR_GROUP_SCHED
        depends on CGROUP_SCHED
        default CGROUP_SCHED
 
        depends on CGROUP_SCHED
        default CGROUP_SCHED
 

+config CFS_BANDWIDTH
+       bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED"
+       depends on EXPERIMENTAL
+       depends on FAIR_GROUP_SCHED
+       default n
+       help
+         This option allows users to define CPU bandwidth rates (limits) for
+         tasks running within the fair group scheduler.  Groups with no limit
+         set are considered to be unconstrained and will run with no
+         restriction.
+         See tip/Documentation/scheduler/sched-bwc.txt for more information.
+

 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
        depends on EXPERIMENTAL
 config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
        depends on EXPERIMENTAL


@@ -935,7 +958,7 @@ config UID16
 config SYSCTL_SYSCALL
        bool "Sysctl syscall support" if EXPERT
        depends on PROC_SYSCTL
 config SYSCTL_SYSCALL
        bool "Sysctl syscall support" if EXPERT
        depends on PROC_SYSCTL

-       default y
+       default n

        select SYSCTL
        ---help---
          sys_sysctl uses binary paths that have been found challenging
        select SYSCTL
        ---help---
          sys_sysctl uses binary paths that have been found challenging


@@ -947,7 +970,7 @@ config SYSCTL_SYSCALL
          trying to save some space it is probably safe to disable this,
          making your kernel marginally smaller.
 
          trying to save some space it is probably safe to disable this,
          making your kernel marginally smaller.
 

-         If unsure say Y here.
+         If unsure say N here.

 
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT
 
 config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT