Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

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

diff --git a/init/Kconfig b/init/Kconfig
index 944bff00c170f73ff6518ee9b55675f92b332229..445af126213461434738b33c8aeec1721c43b214 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -392,6 +392,16 @@ config IRQ_TIME_ACCOUNTING
 
 endchoice
 
+config SCHED_WALT
+        bool "Support window based load tracking"
+        depends on SMP
+        depends on FAIR_GROUP_SCHED
+        help
+        This feature will allow the scheduler to maintain a tunable window
+       based set of metrics for tasks and runqueues. These metrics can be
+       used to guide task placement as well as task frequency requirements
+       for cpufreq governors.
+
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
        depends on MULTIUSER
@@ -1256,6 +1266,7 @@ config SCHED_AUTOGROUP
 
 config SCHED_TUNE
        bool "Boosting for CFS tasks (EXPERIMENTAL)"
+       depends on SMP
        help
          This option enables the system-wide support for task boosting.
          When this support is enabled a new sysctl interface is exposed to
@@ -1280,6 +1291,16 @@ config SCHED_TUNE
 
          If unsure, say N.
 
+config DEFAULT_USE_ENERGY_AWARE
+       bool "Default to enabling the Energy Aware Scheduler feature"
+       default n
+       help
+         This option defaults the ENERGY_AWARE scheduling feature to true,
+         as without SCHED_DEBUG set this feature can't be enabled or disabled
+         via sysctl.
+
+         Say N if unsure.
+
 config SYSFS_DEPRECATED
        bool "Enable deprecated sysfs features to support old userspace tools"
        depends on SYSFS