Unverified Commit 8ac3a8f6 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

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

linux: fix issue in config generation on lqx kernel
parents 8dee8bf3 9401e087

pkgs/os-specific/linux/kernel/common-config.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

    };

pkgs/os-specific/linux/kernel/zen-kernels.nix

+2 −2
Original line number Diff line number Diff line
@@ -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);