Browse code

contrib/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 <kolyshkin@gmail.com>
(cherry picked from commit 18e054358758552828f1ba3ae5859a77e8b2609c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Kir Kolyshkin authored on 2021/01/12 06:31:19
Showing 1 changed files
... ...
@@ -283,8 +283,12 @@ else
283 283
 	netprio=CGROUP_NET_PRIO
284 284
 fi
285 285
 
286
+if [ "$kernelMajor" -lt 5 ]; then
287
+	check_flags IOSCHED_CFQ CFQ_GROUP_IOSCHED
288
+fi
289
+
286 290
 flags=(
287
-	BLK_CGROUP BLK_DEV_THROTTLING IOSCHED_CFQ CFQ_GROUP_IOSCHED
291
+	BLK_CGROUP BLK_DEV_THROTTLING
288 292
 	CGROUP_PERF
289 293
 	CGROUP_HUGETLB
290 294
 	NET_CLS_CGROUP $netprio