diff options
| author | aszlig <aszlig@nix.build> | 2018-12-04 06:17:57 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-12-04 06:22:46 +0100 |
| commit | f129316707d7827c9914aa11dcfbcff965a2e69d (patch) | |
| tree | 928a4e5e8b6f484a0bd5e56452cdeeb1cac745bf /modules/system | |
| parent | 04c420a9d57011391bcd67d8a2b2fad37dfe637a (diff) | |
zswap: Drop patch for z3fold reclaim races
The patch got posted to the LKML a while ago and a better[1] patch[2] eventually got into stable, so we can safely drop the patch on our end. [1]: https://lore.kernel.org/patchwork/patch/959862/#1191565 [2]: https://patchwork.kernel.org/patch/10668441/ Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/kernel/zswap.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/modules/system/kernel/zswap.nix b/modules/system/kernel/zswap.nix index 007c6ae4..3b8d4bca 100644 --- a/modules/system/kernel/zswap.nix +++ b/modules/system/kernel/zswap.nix @@ -20,15 +20,7 @@ in { config = lib.mkIf config.vuizvui.system.kernel.zswap.enable { boot.kernelPatches = lib.singleton { name = "zswap-config"; - # This patch is needed until it hits stable/mainline to prevent z3fold - # crashes. - # - # See also: https://bugs.chromium.org/p/chromium/issues/detail?id=822360 - patch = pkgs.fetchpatch { - name = "z3fold-fix-wrong-handling-of-headless-pages.patch"; - url = "https://patchwork.kernel.org/patch/10510583/raw/"; - sha256 = "0c9l912zgxwy31b7m4xkf31imzvjs11n1i6v5w2sykqfx3sk6a3b"; - }; + patch = null; extraConfig = '' CRYPTO_${if hasZstd then "ZSTD" else "LZO"} y ZSWAP y |