Merge pull request #311793 from lucasew/20240514-fix-linux-config

linux: fix issue in config generation on lqx kernel
This commit is contained in:
Thiago Kenji Okada 2024-05-15 05:09:41 +01:00 committed by GitHub
commit 8ac3a8f680
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View File

@ -876,7 +876,7 @@ let
ZRAM_MULTI_COMP = whenAtLeast "6.2" yes;
ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes;
ZSWAP = option yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (mkOptionDefault yes);
ZPOOL = yes;
ZSMALLOC = option yes;
};

View File

@ -84,8 +84,8 @@ let
SCHED_PDS = yes;
# Swap storage is compressed with LZ4 using zswap
ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes;
ZSWAP_COMPRESSOR_DEFAULT = freeform "lz4";
ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no;
# Fix error: unused option: XXX.
CFS_BANDWIDTH = lib.mkForce (option no);