diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-19 15:38:01 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-19 16:26:01 +0100 |
commit | 23eb5e846d0dfd6825d788b19f6221985e074570 (patch) | |
tree | bb5bf5344649232933ac9b721087af3aa82988d1 /pkgs/os-specific | |
parent | d2f39adea91aa8d682a7c3b06a08ff0050781d21 (diff) | |
parent | e63414078a7dd7ac08dc916af04f01c90d01c875 (diff) | |
download | nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.tar nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.tar.gz nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.tar.bz2 nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.tar.lz nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.tar.xz nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.tar.zst nixpkgs-23eb5e846d0dfd6825d788b19f6221985e074570.zip |
Merge #54095: linux: enable memory hotplug support
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1466b51b261..a5bf51cb84c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -687,6 +687,14 @@ let HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support + # Enable memory hotplug support + # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot + ACPI_HOTPLUG_MEMORY = yes; + MEMORY_HOTPLUG = yes; + MEMORY_HOTREMOVE = yes; + MIGRATION = yes; + SPARSEMEM = yes; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. |