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
commit 1d37727453
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -548,7 +548,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) {
@ -690,6 +692,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