public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: fix kernel config options for i686

Browse Source 
Even the default pkgsi686Linux.linux was broken.
This commit is contained in:
Vladimír Čunát 2020-06-12 08:52:09 +02:00
parent dbdc5af9e8
commit b23c1abe93
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -116,7 +116,7 @@ let
CLS_U32_PERF = yes; CLS_U32_PERF = yes;
CLS_U32_MARK = yes; CLS_U32_MARK = yes;
BPF_JIT = whenPlatformHasEBPFJit 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; HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
BPF_STREAM_PARSER = whenAtLeast "4.19" yes; BPF_STREAM_PARSER = whenAtLeast "4.19" yes;
XDP_SOCKETS = whenAtLeast "4.19" yes; XDP_SOCKETS = whenAtLeast "4.19" yes;
@ -771,8 +771,8 @@ let
HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
# Enable AMD's ROCm GPU compute stack # Enable AMD's ROCm GPU compute stack
HSA_AMD = whenAtLeast "4.20" yes; HSA_AMD = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes);
ZONE_DEVICE = whenAtLeast "5.3" yes; ZONE_DEVICE = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes);
HMM_MIRROR = whenAtLeast "5.3" yes; HMM_MIRROR = whenAtLeast "5.3" yes;
DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes; DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes;