about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-01-19 19:19:28 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-01-19 19:22:02 +0100
commit3fa77297b593bdcbb74250021a0130319384288c (patch)
tree1ea1ec6c1c6bf74e0d547f52c498564004b85b1b
parent0bf9656a575de5f0ee0d3ee9cace6f20de6039d2 (diff)
downloadnixlib-3fa77297b593bdcbb74250021a0130319384288c.tar
nixlib-3fa77297b593bdcbb74250021a0130319384288c.tar.gz
nixlib-3fa77297b593bdcbb74250021a0130319384288c.tar.bz2
nixlib-3fa77297b593bdcbb74250021a0130319384288c.tar.lz
nixlib-3fa77297b593bdcbb74250021a0130319384288c.tar.xz
nixlib-3fa77297b593bdcbb74250021a0130319384288c.tar.zst
nixlib-3fa77297b593bdcbb74250021a0130319384288c.zip
linux: avoid memory hotplug support on most platforms
It broke i686 build, and it's probably not worth it on others, too.
/cc #54095 e63414078a7.
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a5bf51cb84c4..ddd1e9828d51 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -687,6 +687,7 @@ let
       HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI
       HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
 
+    } // 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
       ACPI_HOTPLUG_MEMORY = yes;
@@ -695,7 +696,6 @@ let
       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.
       NR_CPUS = "384";