Merge Linux 4.4.204-rc1 into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index b72e832..2a0e455 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -850,6 +850,16 @@ config LOG_BUF_SHIFT
                     13 =>  8 KB
                     12 =>  4 KB
 
+config CONSOLE_FLUSH_ON_HOTPLUG
+       bool "Enable console flush configurable in hot plug code path"
+       depends on HOTPLUG_CPU
+       def_bool n
+       help
+       In cpu hot plug path console lock acquire and release causes the
+       console to flush. If console lock is not free hot plug latency
+       increases. So make console flush configurable in hot plug path
+       and default disabled to help in cpu hot plug latencies.
+
 config LOG_CPU_MAX_BUF_SHIFT
        int "CPU kernel log buffer size contribution (13 => 8 KB, 17 => 128KB)"
        depends on SMP
@@ -1039,6 +1049,23 @@ config CGROUP_SCHEDTUNE
 config PAGE_COUNTER
        bool
 
+config CGROUP_SCHEDTUNE
+       bool "CFS tasks boosting cgroup subsystem (EXPERIMENTAL)"
+       depends on SCHED_TUNE
+       help
+         This option provides the "schedtune" controller which improves the
+         flexibility of the task boosting mechanism by introducing the support
+         to define "per task" boost values.
+
+         This new controller:
+         1. allows only a two layers hierarchy, where the root defines the
+            system-wide boost value and its direct childrens define each one a
+            different "class of tasks" to be boosted with a different value
+         2. supports up to 16 different task classes, each one which could be
+            configured with a different boost value
+
+         Say N if unsure.
+
 config MEMCG
        bool "Memory Resource Controller for Control Groups"
        select PAGE_COUNTER
@@ -1132,6 +1159,7 @@ config FAIR_GROUP_SCHED
 config CFS_BANDWIDTH
        bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED"
        depends on FAIR_GROUP_SCHED
+       depends on !SCHED_WALT
        default n
        help
          This option allows users to define CPU bandwidth rates (limits) for
@@ -1190,6 +1218,33 @@ config CGROUP_WRITEBACK
 
 endif # CGROUPS
 
+config SCHED_HMP
+       bool "Scheduler support for heterogenous multi-processor systems"
+       depends on SMP && FAIR_GROUP_SCHED
+       help
+         This feature will let the scheduler optimize task placement on
+         systems made of heterogeneous cpus i.e cpus that differ either
+         in their instructions per-cycle capability or the maximum
+         frequency they can attain.
+
+config SCHED_HMP_CSTATE_AWARE
+       bool "CPU C-state aware scheduler"
+       depends on SCHED_HMP
+       help
+         This feature will let the HMP scheduler optimize task placement
+         with CPUs C-state. If this is enabled, scheduler places tasks
+         onto the shallowest C-state CPU among the most power efficient CPUs.
+
+config SCHED_CORE_CTL
+       bool "QTI Core Control"
+       depends on SMP
+       help
+         This options enables the core control functionality in
+         the scheduler. Core control automatically offline and
+         online cores based on cpu load and utilization.
+
+         If unsure, say N here.
+
 config CHECKPOINT_RESTORE
        bool "Checkpoint/restore support" if EXPERT
        select PROC_CHILDREN