From ac6337058a14a6a4bb9f356a757d310415b0e40c Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2019 19:40:39 +0200 Subject: [PATCH 1/2] kernel/common-config: move criu to its own set It was previously in the "test" set, which seemed an inappropriate placement. --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5711e019f95..75bd0109300 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -542,7 +542,9 @@ let TEST_ASYNC_DRIVER_PROBE = option no; WW_MUTEX_SELFTEST = option no; XZ_DEC_TEST = option no; - } // optionalAttrs (features.criu or false) ({ + }; + + criu = optionalAttrs (features.criu or false) ({ EXPERT = yes; CHECKPOINT_RESTORE = yes; } // optionalAttrs (features.criu_revert_expert or true) { From e4c269813c7a41b7b6e3b615a9cb68b2972b4fb5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2019 19:42:24 +0200 Subject: [PATCH 2/2] kernel/common-config: PREEMPT -> PREEMPT_VOLUNTARY --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 75bd0109300..1d2d84ad6c6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -686,6 +686,9 @@ let # Enable AMD's ROCm GPU compute stack HSA_AMD = whenAtLeast "4.20" yes; + PREEMPT = no; + PREEMPT_VOLUNTARY = yes; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable memory hotplug support # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot