From 0fc6b1704ec092f0d43220ca78d81535919cae5d Mon Sep 17 00:00:00 2001 From: ethan-halsall Date: Sat, 3 Aug 2019 15:11:36 +0100 Subject: [PATCH] defconfig sync for 1.3 release Signed-off-by: ethan-halsall --- arch/arm64/configs/simple-beryllium_defconfig | 11 ++++++++++- arch/arm64/configs/simple-dipper_defconfig | 11 ++++++++++- arch/arm64/configs/simple-polaris_defconfig | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/simple-beryllium_defconfig b/arch/arm64/configs/simple-beryllium_defconfig index be0629455553..ff9311a9468f 100644 --- a/arch/arm64/configs/simple-beryllium_defconfig +++ b/arch/arm64/configs/simple-beryllium_defconfig @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Simple-Reloaded-1.2" +CONFIG_LOCALVERSION="-Simple-Reloaded-1.3" CONFIG_LOCALVERSION_AUTO=y CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SWAP is not set @@ -128,6 +128,13 @@ CONFIG_LOG_BUF_SHIFT=21 # CONFIG_CONSOLE_FLUSH_ON_HOTPLUG is not set CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 CONFIG_GENERIC_SCHED_CLOCK=y + +# +# FAIR Scheuler tunables +# +# CONFIG_PELT_UTIL_HALFLIFE_32 is not set +CONFIG_PELT_UTIL_HALFLIFE_16=y +# CONFIG_PELT_UTIL_HALFLIFE_8 is not set CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -734,6 +741,7 @@ CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TCP_CONG_BBR=y # CONFIG_DEFAULT_CUBIC is not set CONFIG_DEFAULT_WESTWOOD=y +# CONFIG_DEFAULT_BBR is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="westwood" # CONFIG_TCP_MD5SIG is not set @@ -1916,6 +1924,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_KEYRESET is not set # CONFIG_INPUT_KEYCOMBO is not set +# CONFIG_POCKET_JUDGE is not set # # Input Device Drivers diff --git a/arch/arm64/configs/simple-dipper_defconfig b/arch/arm64/configs/simple-dipper_defconfig index 067452781b14..565490e5e851 100644 --- a/arch/arm64/configs/simple-dipper_defconfig +++ b/arch/arm64/configs/simple-dipper_defconfig @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Simple-Reloaded-1.2" +CONFIG_LOCALVERSION="-Simple-Reloaded-1.3" CONFIG_LOCALVERSION_AUTO=y CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SWAP is not set @@ -128,6 +128,13 @@ CONFIG_LOG_BUF_SHIFT=21 # CONFIG_CONSOLE_FLUSH_ON_HOTPLUG is not set CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 CONFIG_GENERIC_SCHED_CLOCK=y + +# +# FAIR Scheuler tunables +# +# CONFIG_PELT_UTIL_HALFLIFE_32 is not set +CONFIG_PELT_UTIL_HALFLIFE_16=y +# CONFIG_PELT_UTIL_HALFLIFE_8 is not set CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -734,6 +741,7 @@ CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TCP_CONG_BBR=y # CONFIG_DEFAULT_CUBIC is not set CONFIG_DEFAULT_WESTWOOD=y +# CONFIG_DEFAULT_BBR is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="westwood" # CONFIG_TCP_MD5SIG is not set @@ -1916,6 +1924,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_KEYRESET is not set # CONFIG_INPUT_KEYCOMBO is not set +# CONFIG_POCKET_JUDGE is not set # # Input Device Drivers diff --git a/arch/arm64/configs/simple-polaris_defconfig b/arch/arm64/configs/simple-polaris_defconfig index 65c25393e96d..ac7627a08805 100644 --- a/arch/arm64/configs/simple-polaris_defconfig +++ b/arch/arm64/configs/simple-polaris_defconfig @@ -45,7 +45,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-Simple-Reloaded-1.2" +CONFIG_LOCALVERSION="-Simple-Reloaded-1.3" CONFIG_LOCALVERSION_AUTO=y CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SWAP is not set @@ -128,6 +128,13 @@ CONFIG_LOG_BUF_SHIFT=21 # CONFIG_CONSOLE_FLUSH_ON_HOTPLUG is not set CONFIG_LOG_CPU_MAX_BUF_SHIFT=17 CONFIG_GENERIC_SCHED_CLOCK=y + +# +# FAIR Scheuler tunables +# +# CONFIG_PELT_UTIL_HALFLIFE_32 is not set +CONFIG_PELT_UTIL_HALFLIFE_16=y +# CONFIG_PELT_UTIL_HALFLIFE_8 is not set CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -734,6 +741,7 @@ CONFIG_TCP_CONG_WESTWOOD=y CONFIG_TCP_CONG_BBR=y # CONFIG_DEFAULT_CUBIC is not set CONFIG_DEFAULT_WESTWOOD=y +# CONFIG_DEFAULT_BBR is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="westwood" # CONFIG_TCP_MD5SIG is not set @@ -1916,6 +1924,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_KEYRESET is not set # CONFIG_INPUT_KEYCOMBO is not set +# CONFIG_POCKET_JUDGE is not set # # Input Device Drivers