Skip to content

Commit

Permalink
kernel: Add more supported features
Browse files Browse the repository at this point in the history
  • Loading branch information
wkennington committed Nov 8, 2014
1 parent f1061e3 commit d88c5ee
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pkgs/os-specific/linux/kernel/common-config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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") ''
Expand Down

2 comments on commit d88c5ee

@domenkozar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

breaks all kernels: http://hydra.nixos.org/eval/1157485#tabs-still-fail

unused option: INTEL_IOMMU_DEFAULT_ON

@domenkozar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully fixed in b9388e9

Please sign in to comment.