diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
| commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
| tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
| parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
| download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip | |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 855f854b111d..b392dc853d35 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -699,11 +699,13 @@ let 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 + # Enable CPU/memory hotplug support + # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot + ACPI_HOTPLUG_CPU = yes; ACPI_HOTPLUG_MEMORY = yes; MEMORY_HOTPLUG = yes; MEMORY_HOTREMOVE = yes; + HOTPLUG_CPU = yes; MIGRATION = yes; SPARSEMEM = yes; |