kernel: generic: add missing 5.10 symbols

Add the following kconfig symbols (disabled):

CONFIG_DEFAULT_FQ
CONFIG_DEFAULT_CODEL
CONFIG_DEFAULT_SFQ

Also resort the config with the kconfig.pl script.

Fixes: f39872d966 ("kernel: generic: select the fq_codel qdisc by default")

Tested-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
This commit is contained in:
Rui Salvaterra 2022-02-24 20:52:16 +00:00
parent cf346dfadf
commit 3c561cff0b

View File

@ -1329,8 +1329,10 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_WX is not set # CONFIG_DEBUG_WX is not set
# CONFIG_DEBUG_ZBOOT is not set # CONFIG_DEBUG_ZBOOT is not set
# CONFIG_DECNET is not set # CONFIG_DECNET is not set
# CONFIG_DEFAULT_CODEL is not set
CONFIG_DEFAULT_CUBIC=y CONFIG_DEFAULT_CUBIC=y
CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_DEADLINE=y
# CONFIG_DEFAULT_FQ is not set
CONFIG_DEFAULT_FQ_CODEL=y CONFIG_DEFAULT_FQ_CODEL=y
CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
@ -1343,6 +1345,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel"
CONFIG_DEFAULT_SECURITY="" CONFIG_DEFAULT_SECURITY=""
CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY_DAC=y
# CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set
# CONFIG_DEFAULT_SFQ is not set
CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@ -3594,6 +3597,7 @@ CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_JZ4740 is not set # CONFIG_MTD_NAND_JZ4740 is not set
# CONFIG_MTD_NAND_MPC5121_NFC is not set # CONFIG_MTD_NAND_MPC5121_NFC is not set
# CONFIG_MTD_NAND_MTK is not set # CONFIG_MTD_NAND_MTK is not set
# CONFIG_MTD_NAND_MTK_BMT is not set
# CONFIG_MTD_NAND_MXC is not set # CONFIG_MTD_NAND_MXC is not set
# CONFIG_MTD_NAND_MXIC is not set # CONFIG_MTD_NAND_MXIC is not set
# CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_NANDSIM is not set
@ -3678,7 +3682,6 @@ CONFIG_MTD_SPLIT_SUPPORT=y
# CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_GLUEBI is not set
# CONFIG_MTD_UIMAGE_SPLIT is not set # CONFIG_MTD_UIMAGE_SPLIT is not set
# CONFIG_MTD_VIRT_CONCAT is not set # CONFIG_MTD_VIRT_CONCAT is not set
# CONFIG_MTD_NAND_MTK_BMT is not set
# CONFIG_MTK_MMC is not set # CONFIG_MTK_MMC is not set
# CONFIG_MTK_MMSYS is not set # CONFIG_MTK_MMSYS is not set
# CONFIG_MULTIPLEXER is not set # CONFIG_MULTIPLEXER is not set
@ -4590,14 +4593,14 @@ CONFIG_PROC_SYSCTL=y
# CONFIG_PSB6970_PHY is not set # CONFIG_PSB6970_PHY is not set
# CONFIG_PSI is not set # CONFIG_PSI is not set
# CONFIG_PSTORE is not set # CONFIG_PSTORE is not set
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_COMPRESS is not set # CONFIG_PSTORE_COMPRESS is not set
# CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
# CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_CONSOLE is not set
# CONFIG_PSTORE_DEFLATE_COMPRESS is not set # CONFIG_PSTORE_DEFLATE_COMPRESS is not set
# CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT is not set # CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT is not set
# CONFIG_PSTORE_842_COMPRESS is not set
# CONFIG_PSTORE_LZ4_COMPRESS is not set
# CONFIG_PSTORE_LZ4HC_COMPRESS is not set # CONFIG_PSTORE_LZ4HC_COMPRESS is not set
# CONFIG_PSTORE_LZ4_COMPRESS is not set
# CONFIG_PSTORE_LZO_COMPRESS is not set # CONFIG_PSTORE_LZO_COMPRESS is not set
# CONFIG_PSTORE_PMSG is not set # CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_RAM is not set # CONFIG_PSTORE_RAM is not set