summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2016-09-16 09:08:06 -0400
committerTim Steinbach <tim@nequissimus.com>2016-09-16 15:31:51 +0000
commit77e1be36b945c659d28770bf5993dbfc1a435f02 (patch)
tree9c65ff5ce890b47ddb732204e9be9b536e2a4870 /pkgs/os-specific
parent0ffdb89d956c9daef80858c57040ffe2862164c6 (diff)
downloadnixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.tar
nixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.tar.gz
nixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.tar.bz2
nixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.tar.lz
nixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.tar.xz
nixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.tar.zst
nixlib-77e1be36b945c659d28770bf5993dbfc1a435f02.zip
kernel-common: Add ZBUD, move ZSMALLOC into module space
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 107c87434de4..d7dab32e2971 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -512,9 +512,15 @@ with stdenv.lib;
   TRANSPARENT_HUGEPAGE_MADVISE? y
 
   # zram support (e.g for in-memory compressed swap).
-  ZSMALLOC y
   ZRAM m
   ZSWAP? y
+  ZBUD? y
+  ${optionalString (versionOlder version "3.18") ''
+    ZSMALLOC y
+  ''}
+  ${optionalString (versionAtLeast version "3.18") ''
+    ZSMALLOC m
+  ''}
 
   # Enable PCIe and USB for the brcmfmac driver
   BRCMFMAC_USB? y