bonding: document undocumented active_slave sysfs entry.

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 31ba0fd0f36b5d22c326b38fdc1bb904b8e84cbc..b8930d5a8325fc0557ddb8649e16d7c8d7c68f21 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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"


@@ -947,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


@@ -959,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