From 088bcf4ec463e99176906dabf3b20bc69b794cc1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:38:57 +0300 Subject: [PATCH] kernel config: Fix 3.10, 3.12, 3.14 builds --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8c8ddb03d6fa..f591bdf13d6c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -271,7 +271,7 @@ with stdenv.lib; DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages # Security related features. - RANDOMIZE_BASE y + RANDOMIZE_BASE? y STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default DEVKMEM n # Disable /dev/kmem @@ -498,7 +498,7 @@ with stdenv.lib; # zram support (e.g for in-memory compressed swap). ZSMALLOC y ZRAM m - ZSWAP y + ZSWAP? y # Enable PCIe and USB for the brcmfmac driver BRCMFMAC_USB? y