diff --git a/arch/arm64/configs/merge_kirin970_defconfig b/arch/arm64/configs/merge_kirin970_defconfig index 526f947d3..788cc878d 100644 --- a/arch/arm64/configs/merge_kirin970_defconfig +++ b/arch/arm64/configs/merge_kirin970_defconfig @@ -162,8 +162,8 @@ CONFIG_NET_NS=y CONFIG_HISI_EAS_SCHED=y CONFIG_HISI_MULTI_MARGIN=y CONFIG_HISI_RT_OPT=y -CONFIG_HISI_RT_CAS=y -CONFIG_HISI_RT_ACTIVE_LB=y +# CONFIG_HISI_RT_CAS is not set +# CONFIG_HISI_RT_ACTIVE_LB is not set CONFIG_HISI_ED_TASK=y # CONFIG_HISI_ED_TASK_RESET_AT_UPMIGRATION is not set # CONFIG_HISI_CPU_ISOLATION is not set @@ -362,12 +362,7 @@ CONFIG_IOSCHED_ROW=y # CONFIG_IOSCHED_ZEN is not set CONFIG_IOSCHED_CFQ=m CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_ROW=y -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_MAPLE is not set -# CONFIG_DEFAULT_SIOPLUS is not set -# CONFIG_DEFAULT_ZEN is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_ROW_OPTIMIZATION=y CONFIG_DEFAULT_IOSCHED="row" @@ -812,8 +807,6 @@ CONFIG_TCP_CONG_CUBIC=m # CONFIG_TCP_CONG_WVEGAS is not set # CONFIG_TCP_CONG_BALIA is not set CONFIG_TCP_CONG_BBRPLUS=y -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_BBR is not set CONFIG_DEFAULT_BBRPLUS=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bbrplus"