diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-12 08:52:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-12 08:52:09 +0200 |
| commit | b23c1abe9390b9384c241e16d4da0ea421547c71 (patch) | |
| tree | 0ebb75ba50e6012efe478ccde784fc18de45acb6 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | dbdc5af9e8145dbc7ffe71cf1c7287d7497f1c16 (diff) | |
| download | nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.tar nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.tar.gz nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.tar.bz2 nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.tar.lz nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.tar.xz nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.tar.zst nixpkgs-b23c1abe9390b9384c241e16d4da0ea421547c71.zip | |
linux: fix kernel config options for i686
Even the default pkgsi686Linux.linux was broken.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06ed2cf1559..b1193c7fa73 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -116,7 +116,7 @@ let CLS_U32_PERF = yes; CLS_U32_MARK = yes; BPF_JIT = whenPlatformHasEBPFJit yes; - BPF_JIT_ALWAYS_ON = no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304 + BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304 HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; BPF_STREAM_PARSER = whenAtLeast "4.19" yes; XDP_SOCKETS = whenAtLeast "4.19" yes; @@ -771,8 +771,8 @@ let HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support # Enable AMD's ROCm GPU compute stack - HSA_AMD = whenAtLeast "4.20" yes; - ZONE_DEVICE = whenAtLeast "5.3" yes; + HSA_AMD = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes); + ZONE_DEVICE = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes); HMM_MIRROR = whenAtLeast "5.3" yes; DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes; |