From b3cf4831ee2faeeb18e0af1c15d3e58770f17cb8 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 11 Jan 2021 12:13:29 -0800 Subject: [PATCH] script/check-config.sh: fix IOSCHED_CFQ CFQ_GROUP_IOSCHED These config options are removed by kernel commit f382fb0bcef4, which made its way into kernel v5.0-rc1. Make the check conditional. Signed-off-by: Kir Kolyshkin --- script/check-config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/check-config.sh b/script/check-config.sh index bd2762962..bf13cd1bf 100755 --- a/script/check-config.sh +++ b/script/check-config.sh @@ -254,8 +254,12 @@ else netprio=CGROUP_NET_PRIO fi +if [ "$kernelMajor" -lt 5 ]; then + check_flags IOSCHED_CFQ CFQ_GROUP_IOSCHED +fi + flags=( - BLK_CGROUP BLK_DEV_THROTTLING IOSCHED_CFQ CFQ_GROUP_IOSCHED + BLK_CGROUP BLK_DEV_THROTTLING CGROUP_PERF CGROUP_HUGETLB NET_CLS_CGROUP $netprio