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

xtensa: 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).

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Message-Id: <20200130192129.2677-1-krzk@kernel.org>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

authored by

Krzysztof Kozlowski and committed by
Max Filippov
079a8834 d5226fa6

-12
-2
arch/xtensa/configs/audio_kc705_defconfig
··· 21 21 CONFIG_OPROFILE=y 22 22 CONFIG_MODULES=y 23 23 CONFIG_MODULE_UNLOAD=y 24 - # CONFIG_IOSCHED_DEADLINE is not set 25 - # CONFIG_IOSCHED_CFQ is not set 26 24 CONFIG_XTENSA_VARIANT_CUSTOM=y 27 25 CONFIG_XTENSA_VARIANT_CUSTOM_NAME="test_kc705_hifi" 28 26 CONFIG_XTENSA_UNALIGNED_USER=y
-2
arch/xtensa/configs/cadence_csp_defconfig
··· 27 27 CONFIG_MODULE_FORCE_LOAD=y 28 28 CONFIG_MODULE_UNLOAD=y 29 29 CONFIG_MODULE_FORCE_UNLOAD=y 30 - # CONFIG_IOSCHED_DEADLINE is not set 31 - # CONFIG_IOSCHED_CFQ is not set 32 30 CONFIG_XTENSA_VARIANT_CUSTOM=y 33 31 CONFIG_XTENSA_VARIANT_CUSTOM_NAME="csp" 34 32 CONFIG_XTENSA_UNALIGNED_USER=y
-2
arch/xtensa/configs/generic_kc705_defconfig
··· 21 21 CONFIG_OPROFILE=y 22 22 CONFIG_MODULES=y 23 23 CONFIG_MODULE_UNLOAD=y 24 - # CONFIG_IOSCHED_DEADLINE is not set 25 - # CONFIG_IOSCHED_CFQ is not set 26 24 CONFIG_XTENSA_VARIANT_DC233C=y 27 25 CONFIG_XTENSA_UNALIGNED_USER=y 28 26 CONFIG_PREEMPT=y
-2
arch/xtensa/configs/iss_defconfig
··· 1 1 CONFIG_SYSVIPC=y 2 2 CONFIG_LOG_BUF_SHIFT=14 3 3 CONFIG_EXPERT=y 4 - # CONFIG_IOSCHED_DEADLINE is not set 5 - # CONFIG_IOSCHED_CFQ is not set 6 4 # CONFIG_PCI is not set 7 5 CONFIG_CMDLINE_BOOL=y 8 6 CONFIG_CMDLINE="console=ttyS0,38400 eth0=tuntap,,tap0 ip=192.168.168.5:192.168.168.1 root=nfs nfsroot=192.168.168.1:/opt/montavista/pro/devkit/xtensa/linux_be/target memmap=128M@0"
-2
arch/xtensa/configs/nommu_kc705_defconfig
··· 25 25 CONFIG_PERF_EVENTS=y 26 26 CONFIG_MODULES=y 27 27 CONFIG_MODULE_UNLOAD=y 28 - # CONFIG_IOSCHED_DEADLINE is not set 29 - # CONFIG_IOSCHED_CFQ is not set 30 28 CONFIG_XTENSA_VARIANT_CUSTOM=y 31 29 CONFIG_XTENSA_VARIANT_CUSTOM_NAME="de212" 32 30 # CONFIG_XTENSA_VARIANT_MMU is not set
-2
arch/xtensa/configs/smp_lx200_defconfig
··· 21 21 CONFIG_OPROFILE=y 22 22 CONFIG_MODULES=y 23 23 CONFIG_MODULE_UNLOAD=y 24 - # CONFIG_IOSCHED_DEADLINE is not set 25 - # CONFIG_IOSCHED_CFQ is not set 26 24 CONFIG_XTENSA_VARIANT_CUSTOM=y 27 25 CONFIG_XTENSA_VARIANT_CUSTOM_NAME="test_mmuhifi_c3" 28 26 CONFIG_XTENSA_UNALIGNED_USER=y