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

sh: configs: Cleanup old Kconfig IO scheduler options

CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ 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>
Signed-off-by: Rich Felker <dalias@libc.org>

authored by

Krzysztof Kozlowski and committed by
Rich Felker eface6c5 2bbb0e3c

+4 -38
+2 -1
arch/sh/configs/apsh4ad0a_defconfig
··· 20 20 CONFIG_MODULES=y 21 21 CONFIG_MODULE_UNLOAD=y 22 22 # CONFIG_BLK_DEV_BSG is not set 23 - CONFIG_CFQ_GROUP_IOSCHED=y 23 + CONFIG_IOSCHED_BFQ=y 24 + CONFIG_BFQ_GROUP_IOSCHED=y 24 25 CONFIG_CPU_SUBTYPE_SH7786=y 25 26 CONFIG_MEMORY_SIZE=0x10000000 26 27 CONFIG_HUGETLB_PAGE_SIZE_1MB=y
-2
arch/sh/configs/kfr2r09_defconfig
··· 10 10 CONFIG_MODULES=y 11 11 CONFIG_MODULE_UNLOAD=y 12 12 # CONFIG_BLK_DEV_BSG is not set 13 - # CONFIG_IOSCHED_DEADLINE is not set 14 - # CONFIG_IOSCHED_CFQ is not set 15 13 CONFIG_CPU_SUBTYPE_SH7724=y 16 14 CONFIG_MEMORY_SIZE=0x08000000 17 15 CONFIG_FLATMEM_MANUAL=y
-2
arch/sh/configs/magicpanelr2_defconfig
··· 14 14 CONFIG_MODVERSIONS=y 15 15 CONFIG_MODULE_SRCVERSION_ALL=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_CPU_SUBTYPE_SH7720=y 20 18 CONFIG_MEMORY_START=0x0C000000 21 19 CONFIG_MEMORY_SIZE=0x03F00000
-1
arch/sh/configs/polaris_defconfig
··· 12 12 CONFIG_MODULE_UNLOAD=y 13 13 CONFIG_MODVERSIONS=y 14 14 # CONFIG_BLK_DEV_BSG is not set 15 - # CONFIG_IOSCHED_DEADLINE is not set 16 15 CONFIG_CPU_SUBTYPE_SH7709=y 17 16 CONFIG_MEMORY_START=0x0C000000 18 17 CONFIG_FLATMEM_MANUAL=y
-2
arch/sh/configs/r7780mp_defconfig
··· 12 12 CONFIG_MODULES=y 13 13 CONFIG_MODULE_UNLOAD=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_CPU_SUBTYPE_SH7780=y 18 16 CONFIG_MEMORY_SIZE=0x08000000 19 17 CONFIG_FLATMEM_MANUAL=y
-2
arch/sh/configs/r7785rp_defconfig
··· 15 15 CONFIG_MODULES=y 16 16 CONFIG_MODULE_UNLOAD=y 17 17 # CONFIG_BLK_DEV_BSG is not set 18 - # CONFIG_IOSCHED_DEADLINE is not set 19 - # CONFIG_IOSCHED_CFQ is not set 20 18 CONFIG_CPU_SUBTYPE_SH7785=y 21 19 CONFIG_MEMORY_SIZE=0x08000000 22 20 CONFIG_HUGETLB_PAGE_SIZE_1MB=y
-2
arch/sh/configs/rsk7201_defconfig
··· 15 15 CONFIG_OPROFILE=y 16 16 CONFIG_MODULES=y 17 17 # CONFIG_BLK_DEV_BSG is not set 18 - # CONFIG_IOSCHED_DEADLINE is not set 19 - # CONFIG_IOSCHED_CFQ is not set 20 18 CONFIG_CPU_SUBTYPE_SH7201=y 21 19 CONFIG_MEMORY_SIZE=0x01000000 22 20 CONFIG_FLATMEM_MANUAL=y
-2
arch/sh/configs/rsk7203_defconfig
··· 16 16 CONFIG_OPROFILE=y 17 17 CONFIG_MODULES=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_CPU_SUBTYPE_SH7203=y 22 20 CONFIG_MEMORY_START=0x0c000000 23 21 CONFIG_MEMORY_SIZE=0x01000000
-2
arch/sh/configs/rsk7264_defconfig
··· 17 17 CONFIG_PROFILING=y 18 18 # CONFIG_BLK_DEV_BSG is not set 19 19 CONFIG_PARTITION_ADVANCED=y 20 - # CONFIG_IOSCHED_DEADLINE is not set 21 - # CONFIG_IOSCHED_CFQ is not set 22 20 CONFIG_CPU_SUBTYPE_SH7264=y 23 21 CONFIG_MEMORY_START=0x0c000000 24 22 CONFIG_FLATMEM_MANUAL=y
-2
arch/sh/configs/rsk7269_defconfig
··· 4 4 # CONFIG_VM_EVENT_COUNTERS is not set 5 5 CONFIG_SLAB=y 6 6 # CONFIG_BLK_DEV_BSG is not set 7 - # CONFIG_IOSCHED_DEADLINE is not set 8 - # CONFIG_IOSCHED_CFQ is not set 9 7 CONFIG_SWAP_IO_SPACE=y 10 8 CONFIG_CPU_SUBTYPE_SH7269=y 11 9 CONFIG_MEMORY_START=0x0c000000
+2 -1
arch/sh/configs/sdk7786_defconfig
··· 39 39 CONFIG_KPROBES=y 40 40 CONFIG_MODULES=y 41 41 CONFIG_MODULE_UNLOAD=y 42 - CONFIG_CFQ_GROUP_IOSCHED=y 42 + CONFIG_IOSCHED_BFQ=y 43 + CONFIG_BFQ_GROUP_IOSCHED=y 43 44 CONFIG_CPU_SUBTYPE_SH7786=y 44 45 CONFIG_MEMORY_START=0x40000000 45 46 CONFIG_MEMORY_SIZE=0x20000000
-2
arch/sh/configs/se7206_defconfig
··· 28 28 CONFIG_MODULES=y 29 29 CONFIG_MODULE_UNLOAD=y 30 30 # CONFIG_BLK_DEV_BSG is not set 31 - # CONFIG_IOSCHED_DEADLINE is not set 32 - # CONFIG_IOSCHED_CFQ is not set 33 31 CONFIG_CPU_SUBTYPE_SH7206=y 34 32 CONFIG_MEMORY_START=0x0c000000 35 33 CONFIG_FLATMEM_MANUAL=y
-1
arch/sh/configs/se7343_defconfig
··· 11 11 CONFIG_MODULE_UNLOAD=y 12 12 CONFIG_MODULE_FORCE_UNLOAD=y 13 13 # CONFIG_BLK_DEV_BSG is not set 14 - # CONFIG_IOSCHED_CFQ is not set 15 14 CONFIG_CPU_SUBTYPE_SH7343=y 16 15 CONFIG_MEMORY_START=0x0c000000 17 16 CONFIG_MEMORY_SIZE=0x01000000
-2
arch/sh/configs/se7619_defconfig
··· 11 11 # CONFIG_VM_EVENT_COUNTERS is not set 12 12 CONFIG_SLAB=y 13 13 # CONFIG_BLK_DEV_BSG is not set 14 - # CONFIG_IOSCHED_DEADLINE is not set 15 - # CONFIG_IOSCHED_CFQ is not set 16 14 CONFIG_MEMORY_START=0x0c000000 17 15 CONFIG_FLATMEM_MANUAL=y 18 16 CONFIG_CPU_BIG_ENDIAN=y
-2
arch/sh/configs/se7705_defconfig
··· 8 8 CONFIG_SLAB=y 9 9 CONFIG_MODULES=y 10 10 # CONFIG_BLK_DEV_BSG is not set 11 - # CONFIG_IOSCHED_DEADLINE is not set 12 - # CONFIG_IOSCHED_CFQ is not set 13 11 CONFIG_CPU_SUBTYPE_SH7705=y 14 12 CONFIG_MEMORY_START=0x0c000000 15 13 CONFIG_MEMORY_SIZE=0x02000000
-2
arch/sh/configs/se7712_defconfig
··· 12 12 CONFIG_SLAB=y 13 13 CONFIG_MODULES=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_CPU_SUBTYPE_SH7712=y 18 16 CONFIG_MEMORY_START=0x0c000000 19 17 CONFIG_MEMORY_SIZE=0x02000000
-2
arch/sh/configs/se7721_defconfig
··· 12 12 CONFIG_SLAB=y 13 13 CONFIG_MODULES=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_CPU_SUBTYPE_SH7721=y 18 16 CONFIG_MEMORY_START=0x0c000000 19 17 CONFIG_MEMORY_SIZE=0x02000000
-2
arch/sh/configs/se7722_defconfig
··· 8 8 CONFIG_MODULES=y 9 9 CONFIG_MODULE_UNLOAD=y 10 10 # CONFIG_BLK_DEV_BSG is not set 11 - # CONFIG_IOSCHED_DEADLINE is not set 12 - # CONFIG_IOSCHED_CFQ is not set 13 11 CONFIG_CPU_SUBTYPE_SH7722=y 14 12 CONFIG_MEMORY_START=0x0c000000 15 13 CONFIG_NUMA=y
-1
arch/sh/configs/se7780_defconfig
··· 9 9 CONFIG_SLAB=y 10 10 CONFIG_MODULES=y 11 11 CONFIG_MODULE_UNLOAD=y 12 - # CONFIG_IOSCHED_CFQ is not set 13 12 CONFIG_CPU_SUBTYPE_SH7780=y 14 13 CONFIG_MEMORY_SIZE=0x08000000 15 14 CONFIG_SH_7780_SOLUTION_ENGINE=y
-1
arch/sh/configs/sh7710voipgw_defconfig
··· 11 11 CONFIG_MODULE_UNLOAD=y 12 12 CONFIG_MODULE_FORCE_UNLOAD=y 13 13 # CONFIG_BLK_DEV_BSG is not set 14 - # CONFIG_IOSCHED_CFQ is not set 15 14 CONFIG_CPU_SUBTYPE_SH7710=y 16 15 CONFIG_MEMORY_START=0x0c000000 17 16 CONFIG_MEMORY_SIZE=0x00800000
-2
arch/sh/configs/shmin_defconfig
··· 12 12 # CONFIG_SHMEM is not set 13 13 CONFIG_SLOB=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_CPU_SUBTYPE_SH7706=y 18 16 CONFIG_MEMORY_START=0x0c000000 19 17 CONFIG_MEMORY_SIZE=0x00800000
-2
arch/sh/configs/ul2_defconfig
··· 8 8 CONFIG_MODULES=y 9 9 CONFIG_MODULE_UNLOAD=y 10 10 # CONFIG_BLK_DEV_BSG is not set 11 - # CONFIG_IOSCHED_DEADLINE is not set 12 - # CONFIG_IOSCHED_CFQ is not set 13 11 CONFIG_CPU_SUBTYPE_SH7366=y 14 12 CONFIG_MEMORY_SIZE=0x01f00000 15 13 CONFIG_NUMA=y