public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61162 from lheckemann/kernel-preempt-voluntary 

Kernel config: use PREEMPT_VOLUNTARY
This commit is contained in:
Linus Heckemann 2019-05-14 17:37:19 +02:00 committed by GitHub
parent faf5e8ad8c e4c269813c
commit 1d37727453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -548,7 +548,9 @@ let
TEST_ASYNC_DRIVER_PROBE = option no; TEST_ASYNC_DRIVER_PROBE = option no;
WW_MUTEX_SELFTEST = option no; WW_MUTEX_SELFTEST = option no;
XZ_DEC_TEST = option no; XZ_DEC_TEST = option no;
} // optionalAttrs (features.criu or false) ({ };
criu = optionalAttrs (features.criu or false) ({
EXPERT = yes; EXPERT = yes;
CHECKPOINT_RESTORE = yes; CHECKPOINT_RESTORE = yes;
} // optionalAttrs (features.criu_revert_expert or true) { } // optionalAttrs (features.criu_revert_expert or true) {
@ -690,6 +692,9 @@ let
# Enable AMD's ROCm GPU compute stack # Enable AMD's ROCm GPU compute stack
HSA_AMD = whenAtLeast "4.20" yes; HSA_AMD = whenAtLeast "4.20" yes;
PREEMPT = no;
PREEMPT_VOLUNTARY = yes;
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable memory hotplug support # Enable memory hotplug support
# Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot