diff options
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c882ae3d029d..0aaefc2a723e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -67,7 +67,7 @@ with stdenv.lib; # Networking options. IP_PNP n ${optionalString (versionOlder version "3.13") '' - IPV6_PRIVACY y + IPV6_PRIVACY y ''} NETFILTER_ADVANCED y IP_VS_PROTO_TCP y @@ -77,7 +77,9 @@ with stdenv.lib; IP_DCCP_CCID3 n # experimental CLS_U32_PERF y CLS_U32_MARK y - BPF_JIT y + ${optionalString (stdenv.system == "x86_64-linux") '' + BPF_JIT y + ''} # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build @@ -316,8 +318,10 @@ with stdenv.lib; ${optionalString (!stdenv.is64bit) '' HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. ''} - INTEL_IOMMU_DEFAULT_ON y - ${optionalString (versionAtLeast version "3.9") '' + ${optionalString stdenv.is64bit '' + INTEL_IOMMU_DEFAULT_ON y + ''} + ${optionalString (versionAtLeast version "3.9" && stdenv.is64bit) '' VFIO_PCI_VGA y ''} VIRT_DRIVERS y |