about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-11-13 12:14:11 +0100
committerAlyssa Ross <hi@alyssa.is>2023-11-13 15:33:39 +0100
commit2e891693f2d429e1f54b224619038cfc4659271d (patch)
treef3acc17d93f27a621c94281278ff341a049e148f /pkgs/os-specific/linux/kernel/common-config.nix
parentee137e017ce5c73113f83506f588d3e2cdbce95d (diff)
linux_testing: 6.6-rc7 -> 6.7-rc1
ZSMALLOC is now the default allocator for ZSWAP, so if the allocator
isn't changed, ZSMALLOC must be y on 6.7 (and will default to that).
The script will set all options that can be modules to m anyway, so
there was no need for us to be explicitly setting it to module before
anyway.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1aedcdc7c0fdf..1ce9aa72a4841 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -722,7 +722,6 @@ let
       ZSWAP          = option yes;
       ZPOOL          = yes;
       ZBUD           = option yes;
-      ZSMALLOC       = module;
     };
 
     brcmfmac = {