Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kerne...

[firefly-linux-kernel-4.4.55.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index e72fa17fe55942da416e2cb91a22fd254c8d3ae2..af958ad26d60087a229baa5eb5e30b214418e8db 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -69,11 +69,6 @@ config BROKEN_ON_SMP
        depends on BROKEN || !SMP
        default y
 
-config LOCK_KERNEL
-       bool
-       depends on (SMP || PREEMPT) && BKL
-       default y
-
 config INIT_ENV_ARG_LIMIT
        int
        default 32 if !UML
@@ -695,6 +690,16 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
          select this option (if, for some reason, they need to disable it
          then noswapaccount does the trick).
 
+config CGROUP_PERF
+       bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
+       depends on PERF_EVENTS && CGROUPS
+       help
+         This option extends the per-cpu mode to restrict monitoring to
+         threads which belong to the cgroup specified and run on the
+         designated cpu.
+
+         Say N if unsure.
+
 menuconfig CGROUP_SCHED
        bool "Group CPU scheduler"
        depends on EXPERIMENTAL
@@ -740,9 +745,9 @@ config BLK_CGROUP
 
        This option only enables generic Block IO controller infrastructure.
        One needs to also enable actual IO controlling logic/policy. For
-       enabling proportional weight division of disk bandwidth in CFQ seti
-       CONFIG_CFQ_GROUP_IOSCHED=y and for enabling throttling policy set
-       CONFIG_BLK_THROTTLE=y.
+       enabling proportional weight division of disk bandwidth in CFQ, set
+       CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+       CONFIG_BLK_DEV_THROTTLING=y.
 
        See Documentation/cgroups/blkio-controller.txt for more information.
 
@@ -822,11 +827,16 @@ config SCHED_AUTOGROUP
          desktop applications.  Task group autogeneration is currently based
          upon task session.
 
+config SCHED_TTWU_QUEUE
+       bool
+       depends on !SPARC32
+       default y
+
 config MM_OWNER
        bool
 
 config SYSFS_DEPRECATED
-       bool "enable deprecated sysfs features to support old userspace tools"
+       bool "Enable deprecated sysfs features to support old userspace tools"
        depends on SYSFS
        default n
        help
@@ -849,7 +859,7 @@ config SYSFS_DEPRECATED
          need to say Y here.
 
 config SYSFS_DEPRECATED_V2
-       bool "enabled deprecated sysfs features by default"
+       bool "Enable deprecated sysfs features by default"
        default n
        depends on SYSFS
        depends on SYSFS_DEPRECATED
@@ -919,14 +929,6 @@ menuconfig EXPERT
           environments which can tolerate a "non-standard" kernel.
           Only use this if you really know what you are doing.
 
-config EMBEDDED
-       bool "Embedded system"
-       select EXPERT
-       help
-         This option should be enabled if compiling the kernel for
-         an embedded system so certain expert options are available
-         for configuration.
-
 config UID16
        bool "Enable 16-bit UID system calls" if EXPERT
        depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@ -1099,6 +1101,14 @@ config AIO
           by some high performance threaded applications. Disabling
           this option saves about 7k.
 
+config EMBEDDED
+       bool "Embedded system"
+       select EXPERT
+       help
+         This option should be enabled if compiling the kernel for
+         an embedded system so certain expert options are available
+         for configuration.
+
 config HAVE_PERF_EVENTS
        bool
        help