Merge pull request #18661 from NeQuissimus/kernel/zbud

kernel-common: Add ZBUD
2016-09-25 12:33:08 +04:00
parent ec8d5945ce 77e1be36b9
commit ea4d517eb8
1 changed files with 7 additions and 1 deletions
--- 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