From 26db9b9527c29f0945af0e613845680c140e9ee1 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 May 2023 16:30:49 +0300 Subject: linux/common-config: fix i686 --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 356b794039e..44997740aea 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -80,7 +80,10 @@ let # Enable lazy RCUs for power savings: # https://lore.kernel.org/rcu/20221019225138.GA2499943@paulmck-ThinkPad-P17-Gen-1/ - RCU_LAZY = whenAtLeast "6.2" yes; + # RCU_LAZY depends on RCU_NOCB_CPU depends on NO_HZ_FULL + # depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT, + # so we can't force-enable this + RCU_LAZY = whenAtLeast "6.2" (option yes); } // optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; @@ -128,7 +131,8 @@ let timer = { # Enable Full Dynticks System. - NO_HZ_FULL = mkIf stdenv.is64bit yes; # TODO: more precise condition? + # NO_HZ_FULL depends on HAVE_VIRT_CPU_ACCOUNTING_GEN depends on 64BIT + NO_HZ_FULL = mkIf stdenv.is64bit yes; }; # Enable NUMA. -- cgit 1.4.1