diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-10-14 11:40:35 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-10-14 11:43:18 +0100 |
| commit | 14a6713aefdc711db264735901e2581555f1e86e (patch) | |
| tree | e8b2ec0a2bb29d69831aa8631b819fe88d329dab /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | d633ec9787a7060d0f9bc42941759a3573a1d14b (diff) | |
| download | nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.tar nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.tar.gz nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.tar.bz2 nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.tar.lz nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.tar.xz nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.tar.zst nixpkgs-14a6713aefdc711db264735901e2581555f1e86e.zip | |
linux: remove deprecated kernel config options
Our oldest kernel is 4.4. That's why we can remove configurations that only applies to kernels older than that.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 734509dfd56..5336ab4d977 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -33,7 +33,6 @@ let DYNAMIC_DEBUG = yes; TIMER_STATS = whenOlder "4.11" yes; DEBUG_NX_TEST = whenOlder "4.11" no; - CPU_NOTIFIER_ERROR_INJECT = whenOlder "4.4" (option no); DEBUG_STACK_USAGE = no; DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) no; RCU_TORTURE_TEST = no; @@ -194,8 +193,6 @@ let }; video = { - # Enable KMS for devices whose X.org driver supports it - DRM_I915_KMS = whenOlder "4.3" yes; # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; VGA_SWITCHEROO = yes; # Hybrid graphics support @@ -264,7 +261,6 @@ let EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; EXT2_FS_SECURITY = yes; - EXT2_FS_XIP = whenOlder "4.0" yes; # Ext2 execute in place support EXT3_FS_POSIX_ACL = yes; EXT3_FS_SECURITY = yes; @@ -366,10 +362,6 @@ let MICROCODE = yes; MICROCODE_INTEL = yes; MICROCODE_AMD = yes; - - MICROCODE_EARLY = whenOlder "4.4" yes; - MICROCODE_INTEL_EARLY = whenOlder "4.4" yes; - MICROCODE_AMD_EARLY = whenOlder "4.4" yes; } // optionalAttrs (versionAtLeast version "4.10") { # Write Back Throttling # https://lwn.net/Articles/682582/ @@ -714,7 +706,7 @@ let PREEMPT = no; PREEMPT_VOLUNTARY = yes; - + X86_AMD_PLATFORM_DEVICE = yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { |