From b94b559058929fecb347bc78a86143ed670891d5 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 19 Dec 2023 17:21:01 -0800 Subject: [PATCH] scripts/check-config: don't check MEMCG_SWAP on newer kernels Kernel commit e55b9f96860f (which made its way into Linux v6.1-rc1) removes CONFIG_MEMCG_SWAP entirely, so there's no sense to check for in on newer kernels. Make the check conditional. Signed-off-by: Kir Kolyshkin --- script/check-config.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/script/check-config.sh b/script/check-config.sh index acc5547cf..2de94d292 100755 --- a/script/check-config.sh +++ b/script/check-config.sh @@ -255,8 +255,9 @@ echo 'Optional Features:' check_flags SECCOMP_FILTER check_flags CGROUP_PIDS - check_flags MEMCG_SWAP - + if kernel_lt 6 1; then + check_flags MEMCG_SWAP + fi if kernel_lt 5 8; then check_flags MEMCG_SWAP_ENABLED if is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then