diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-03-21 20:30:37 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-03-21 20:32:36 -0400 |
| commit | c60102d177e6e2e95e16f396662c9c65d9751a49 (patch) | |
| tree | 5fabc0801b7bca308a9a76c39fe6aa5e16ee3473 | |
| parent | 693d0e7fea78270cb45392dcf2b4b381dbdd3ef1 (diff) | |
| download | nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.tar nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.tar.gz nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.tar.bz2 nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.tar.lz nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.tar.xz nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.tar.zst nixpkgs-c60102d177e6e2e95e16f396662c9c65d9751a49.zip | |
linux: 4.11-rc2 -> 4.11-rc3
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c02b8209f2f..09e4d9e1ecd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -33,7 +33,6 @@ with stdenv.lib; DEBUG_KERNEL y DYNAMIC_DEBUG y BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n @@ -41,6 +40,10 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y + ${optionalString (versionOlder version "4.10") '' + CPU_NOTIFIER_ERROR_INJECT? n + ''} + ${optionalString (versionOlder version "4.11") '' TIMER_STATS y DEBUG_NX_TEST n @@ -308,7 +311,9 @@ with stdenv.lib; NLS_ISO8859_1 m # VFAT default for the iocharset= mount option # Runtime security tests - DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages + ${optionalString (versionOlder version "4.11") '' + DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages + ''} # Security related features. RANDOMIZE_BASE? y @@ -456,7 +461,11 @@ with stdenv.lib; FTRACE_SYSCALLS y SCHED_TRACER y STACK_TRACER y - UPROBE_EVENT? y + + ${optionalString (versionOlder version "4.11") '' + UPROBE_EVENT? y + ''} + ${optionalString (versionAtLeast version "4.4") '' BPF_SYSCALL y BPF_EVENTS y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index b9f5d152bf6..5f0d2db27f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11-rc2"; - modDirVersion = "4.11.0-rc2"; + version = "4.11-rc3"; + modDirVersion = "4.11.0-rc3"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1rfdnx7klrb8z9372ydmrsw6bk3i6xqa0am3vjqy75mjp54063vx"; + sha256 = "07y54bl2i4qsz36hwbp3k56k8hzjyvs82cimrg0hnp2xca537vxz"; }; features.iwlwifi = true; |