tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: configs: Cleanup old Kconfig options

CONFIG_MTD_NAND_IDS is gone and not needed (part of CONFIG_MTD_NAND)
since commit f16bd7ca0457 ("mtd: nand: Kill the MTD_NAND_IDS Kconfig
option").

CONFIG_IOSCHED_DEADLINE, CONFIG_IOSCHED_CFQ and CONFIG_DEFAULT_NOOP are
gone since commit f382fb0bcef4 ("block: remove legacy IO schedulers").

The IOSCHED_DEADLINE was replaced by MQ_IOSCHED_DEADLINE and it will be
now enabled by default (along with MQ_IOSCHED_KYBER).

The BFQ_GROUP_IOSCHED is the only multiqueue scheduler which comes with
group scheduling so select it in configs previously choosing
CFQ_GROUP_IOSCHED.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org

authored by

Krzysztof Kozlowski and committed by
Paul Burton f6541f34 9926108f

+4 -23
-1
arch/mips/configs/ar7_defconfig
··· 21 21 # CONFIG_BLK_DEV_BSG is not set 22 22 CONFIG_PARTITION_ADVANCED=y 23 23 CONFIG_BSD_DISKLABEL=y 24 - # CONFIG_IOSCHED_CFQ is not set 25 24 CONFIG_NET=y 26 25 CONFIG_PACKET=y 27 26 CONFIG_UNIX=y
-1
arch/mips/configs/ath25_defconfig
··· 22 22 CONFIG_MODULES=y 23 23 CONFIG_MODULE_UNLOAD=y 24 24 # CONFIG_BLK_DEV_BSG is not set 25 - # CONFIG_IOSCHED_CFQ is not set 26 25 # CONFIG_COMPACTION is not set 27 26 CONFIG_NET=y 28 27 CONFIG_PACKET=y
-1
arch/mips/configs/ath79_defconfig
··· 23 23 CONFIG_MODULES=y 24 24 CONFIG_MODULE_UNLOAD=y 25 25 # CONFIG_BLK_DEV_BSG is not set 26 - # CONFIG_IOSCHED_CFQ is not set 27 26 CONFIG_NET=y 28 27 CONFIG_PACKET=y 29 28 CONFIG_UNIX=y
-2
arch/mips/configs/bcm63xx_defconfig
··· 21 21 CONFIG_PCCARD=y 22 22 CONFIG_PCMCIA_BCM63XX=y 23 23 # CONFIG_BLK_DEV_BSG is not set 24 - # CONFIG_IOSCHED_DEADLINE is not set 25 - # CONFIG_IOSCHED_CFQ is not set 26 24 CONFIG_NET=y 27 25 CONFIG_UNIX=y 28 26 CONFIG_INET=y
-2
arch/mips/configs/bmips_be_defconfig
··· 12 12 # CONFIG_SECCOMP is not set 13 13 CONFIG_MIPS_O32_FP64_SUPPORT=y 14 14 # CONFIG_BLK_DEV_BSG is not set 15 - # CONFIG_IOSCHED_DEADLINE is not set 16 - # CONFIG_IOSCHED_CFQ is not set 17 15 CONFIG_NET=y 18 16 CONFIG_PACKET=y 19 17 CONFIG_PACKET_DIAG=y
-2
arch/mips/configs/bmips_stb_defconfig
··· 21 21 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y 22 22 CONFIG_BMIPS_CPUFREQ=y 23 23 # CONFIG_BLK_DEV_BSG is not set 24 - # CONFIG_IOSCHED_DEADLINE is not set 25 - # CONFIG_IOSCHED_CFQ is not set 26 24 CONFIG_NET=y 27 25 CONFIG_PACKET=y 28 26 CONFIG_PACKET_DIAG=y
-1
arch/mips/configs/db1xxx_defconfig
··· 28 28 CONFIG_FIRMWARE_MEMMAP=y 29 29 CONFIG_BLK_DEV_BSGLIB=y 30 30 CONFIG_PARTITION_ADVANCED=y 31 - CONFIG_DEFAULT_NOOP=y 32 31 CONFIG_CMA=y 33 32 CONFIG_CMA_DEBUG=y 34 33 CONFIG_NET=y
-1
arch/mips/configs/generic/board-ni169445.config
··· 19 19 CONFIG_MTD_NAND_ECC_SW_BCH=y 20 20 CONFIG_MTD_RAW_NAND=y 21 21 CONFIG_MTD_NAND_GPIO=y 22 - CONFIG_MTD_NAND_IDS=y 23 22 24 23 CONFIG_MTD_UBI=y 25 24 CONFIG_MTD_UBI_BLOCK=y
-2
arch/mips/configs/lasat_defconfig
··· 16 16 # CONFIG_SECCOMP is not set 17 17 CONFIG_PCI=y 18 18 # CONFIG_BLK_DEV_BSG is not set 19 - # CONFIG_IOSCHED_DEADLINE is not set 20 - # CONFIG_IOSCHED_CFQ is not set 21 19 CONFIG_NET=y 22 20 CONFIG_PACKET=y 23 21 CONFIG_UNIX=y
+1 -1
arch/mips/configs/lemote2f_defconfig
··· 26 26 CONFIG_MODULE_UNLOAD=y 27 27 CONFIG_MODVERSIONS=y 28 28 CONFIG_BLK_DEV_INTEGRITY=y 29 - CONFIG_IOSCHED_DEADLINE=m 29 + CONFIG_MQ_IOSCHED_DEADLINE=m 30 30 CONFIG_BINFMT_MISC=m 31 31 CONFIG_NET=y 32 32 CONFIG_PACKET=y
+3 -2
arch/mips/configs/loongson3_defconfig
··· 38 38 CONFIG_MODULE_FORCE_UNLOAD=y 39 39 CONFIG_MODVERSIONS=y 40 40 CONFIG_PARTITION_ADVANCED=y 41 - CONFIG_IOSCHED_DEADLINE=m 42 - CONFIG_CFQ_GROUP_IOSCHED=y 41 + CONFIG_MQ_IOSCHED_DEADLINE=m 42 + CONFIG_IOSCHED_BFQ=y 43 + CONFIG_BFQ_GROUP_IOSCHED=y 43 44 CONFIG_BINFMT_MISC=m 44 45 CONFIG_KSM=y 45 46 CONFIG_NET=y
-2
arch/mips/configs/msp71xx_defconfig
··· 14 14 CONFIG_MODULES=y 15 15 CONFIG_MODULE_UNLOAD=y 16 16 CONFIG_MODVERSIONS=y 17 - # CONFIG_IOSCHED_DEADLINE is not set 18 - # CONFIG_IOSCHED_CFQ is not set 19 17 CONFIG_NET=y 20 18 CONFIG_UNIX=y 21 19 CONFIG_XFRM_USER=y
-2
arch/mips/configs/pnx8335_stb225_defconfig
··· 14 14 CONFIG_MODULES=y 15 15 CONFIG_MODULE_UNLOAD=y 16 16 # CONFIG_BLK_DEV_BSG is not set 17 - # CONFIG_IOSCHED_DEADLINE is not set 18 - # CONFIG_IOSCHED_CFQ is not set 19 17 CONFIG_NET=y 20 18 CONFIG_PACKET=y 21 19 CONFIG_UNIX=y
-1
arch/mips/configs/rb532_defconfig
··· 23 23 CONFIG_PARTITION_ADVANCED=y 24 24 CONFIG_MAC_PARTITION=y 25 25 CONFIG_BSD_DISKLABEL=y 26 - # CONFIG_IOSCHED_CFQ is not set 27 26 CONFIG_NET=y 28 27 CONFIG_PACKET=y 29 28 CONFIG_UNIX=y
-1
arch/mips/configs/rt305x_defconfig
··· 21 21 CONFIG_MODULE_UNLOAD=y 22 22 # CONFIG_BLK_DEV_BSG is not set 23 23 CONFIG_PARTITION_ADVANCED=y 24 - # CONFIG_IOSCHED_CFQ is not set 25 24 # CONFIG_COREDUMP is not set 26 25 # CONFIG_COMPACTION is not set 27 26 CONFIG_NET=y
-1
arch/mips/configs/xway_defconfig
··· 23 23 CONFIG_MODULE_UNLOAD=y 24 24 # CONFIG_BLK_DEV_BSG is not set 25 25 CONFIG_PARTITION_ADVANCED=y 26 - # CONFIG_IOSCHED_CFQ is not set 27 26 # CONFIG_COREDUMP is not set 28 27 # CONFIG_COMPACTION is not set 29 28 CONFIG_NET=y