diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-06 16:38:57 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-06 17:06:45 +0300 |
| commit | 088bcf4ec463e99176906dabf3b20bc69b794cc1 (patch) | |
| tree | cc67466ecdeb639cacace83961d5ef364da4301c /pkgs | |
| parent | 44f462bf4d2d8878a9206ac0f6eb095cfc48e95f (diff) | |
| download | nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.tar nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.tar.gz nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.tar.bz2 nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.tar.lz nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.tar.xz nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.tar.zst nixpkgs-088bcf4ec463e99176906dabf3b20bc69b794cc1.zip | |
kernel config: Fix 3.10, 3.12, 3.14 builds
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 |
1 files 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 8c8ddb03d6f..f591bdf13d6 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 |