Merge 4.4.203 into android-4.4-p

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

diff --git a/init/Kconfig b/init/Kconfig
index a35e73a..369e7c6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1132,6 +1132,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
@@ -1382,6 +1383,17 @@ source "usr/Kconfig"
 
 endif
 
+choice
+       prompt "Compiler optimization level"
+       default CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
+
+config CC_OPTIMIZE_FOR_PERFORMANCE
+       bool "Optimize for performance"
+       help
+         This is the default optimization level for the kernel, building
+         with the "-O2" compiler flag for best performance and most
+         helpful compile-time warnings.
+
 config CC_OPTIMIZE_FOR_SIZE
        bool "Optimize for size"
        help
@@ -1390,6 +1402,8 @@ config CC_OPTIMIZE_FOR_SIZE
 
          If unsure, say N.
 
+endchoice
+
 config SYSCTL
        bool