summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-10 20:21:28 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-10 20:21:28 +0100
commite78a1603fc872fe3894d49f1686ba18d9bc9eaff (patch)
tree576e1ef9d53f9d8bcda16e1e318583b3cffa179d /pkgs/os-specific/linux
parent28abe40149feedcd8528aa2843af6f33a06954e5 (diff)
downloadnixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.tar
nixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.tar.gz
nixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.tar.bz2
nixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.tar.lz
nixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.tar.xz
nixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.tar.zst
nixlib-e78a1603fc872fe3894d49f1686ba18d9bc9eaff.zip
linux: Enable BPF_JIT only on 64-bit
It's not supported on i686.

http://hydra.nixos.org/build/16834647
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c882ae3d029d..1af44088daef 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