Commit eface6c5 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Rich Felker
Browse files

sh: configs: Cleanup old Kconfig IO scheduler options 



CONFIG_IOSCHED_DEADLINE and CONFIG_IOSCHED_CFQ are gone since
commit f382fb0b ("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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent 2bbb0e3c

arch/sh/configs/apsh4ad0a_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ CONFIG_PROFILING=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_CPU_SUBTYPE_SH7786=y

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_HUGETLB_PAGE_SIZE_1MB=y

arch/sh/configs/kfr2r09_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ CONFIG_SLAB=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_CPU_SUBTYPE_SH7724=y

CONFIG_MEMORY_SIZE=0x08000000

CONFIG_FLATMEM_MANUAL=y

arch/sh/configs/magicpanelr2_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_CPU_SUBTYPE_SH7720=y

CONFIG_MEMORY_START=0x0C000000

CONFIG_MEMORY_SIZE=0x03F00000

arch/sh/configs/polaris_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_CPU_SUBTYPE_SH7709=y

CONFIG_MEMORY_START=0x0C000000

CONFIG_FLATMEM_MANUAL=y

arch/sh/configs/r7780mp_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ CONFIG_OPROFILE=m 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_CPU_SUBTYPE_SH7780=y

CONFIG_MEMORY_SIZE=0x08000000

CONFIG_FLATMEM_MANUAL=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE