summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-11-08 02:44:19 -0800
committerWilliam A. Kennington III <william@wkennington.com>2014-11-08 02:44:19 -0800
commitd88c5eed1d7cb2a6fcd0b10881133b7a79e00a37 (patch)
treec4053d0695818dd41355e2c909b3c69bb5a99829 /pkgs
parentf1061e3911be22bf20310208a1d56e9b2fcb6d34 (diff)
downloadnixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.tar
nixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.tar.gz
nixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.tar.bz2
nixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.tar.lz
nixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.tar.xz
nixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.tar.zst
nixlib-d88c5eed1d7cb2a6fcd0b10881133b7a79e00a37.zip
kernel: Add more supported features
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 0cb305551b64..3ea4b1449376 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -77,6 +77,7 @@ with stdenv.lib;
   IP_DCCP_CCID3 n # experimental
   CLS_U32_PERF y
   CLS_U32_MARK y
+  BPF_JIT y
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
@@ -175,6 +176,12 @@ with stdenv.lib;
   CIFS_XATTR y
   CIFS_POSIX y
   CIFS_FSCACHE y
+  ${optionalString (versionAtLeast version "3.12") ''
+    CEPH_FSCACHE y
+  ''}
+  ${optionalString (versionAtLeast version "3.14") ''
+    CEPH_FS_POSIX_ACL y
+  ''}
 
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem
@@ -308,6 +315,11 @@ 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") ''
+    VFIO_PCI_VGA y
+  ''}
+  VIRT_DRIVERS y
 
   # Media support.
   ${optionalString (versionAtLeast version "3.6") ''