Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: faf5e8ad8cf2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d37727453a3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on May 8, 2019

  1. kernel/common-config: move criu to its own set 

    It was previously in the "test" set, which seemed an inappropriate
placement.
    @lheckemann
    lheckemann committed May 8, 2019
    Copy the full SHA
    ac63370 View commit details

  2. kernel/common-config: PREEMPT -> PREEMPT_VOLUNTARY

    @lheckemann
    lheckemann committed May 8, 2019
    Copy the full SHA
    e4c2698 View commit details

Commits on May 14, 2019

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

    Kernel config: use PREEMPT_VOLUNTARY
    @lheckemann
    lheckemann authored May 14, 2019
    Copy the full SHA
    1d37727 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/os-specific/linux/kernel/common-config.nix
7 changes: 6 additions & 1 deletion pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -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