From 9401e087e2a485560dd67f60db0457bf5e7dce67 Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 14 May 2024 22:49:41 -0300 Subject: linux: fix issue in config generation on lqx kernel Signed-off-by: lucasew --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 62922d442697f..84090cba867e1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -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; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 1f36e36c2335e..d2e32e4b09a75 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -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); -- cgit 1.4.1