From 1d6f702f95be65ad48718b2b28dfb213efdf906f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 7 Jan 2024 14:26:12 +0100 Subject: [PATCH] linux: set CONFIG_X86_GENERIC > This is really intended for distributors who need more generic > optimizations. Apparently it's expected that as a generic distribution, we set this, and if we had we wouldn't have been affected by the recent 32-bit x86 Xen breakage[1][2]: > In normal distro kernels, CONFIG_X86_GENERIC is enabled [1]: https://lore.kernel.org/lkml/20231204084722.3789473-1-arnd@kernel.org/ [2]: 096639c548e2 ("linux: drop XEN on 32-bit") --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06668abdccc7..4108faf42213 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -123,6 +123,7 @@ let }; optimization = { + X86_GENERIC = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; # Optimize with -O2, not -Os CC_OPTIMIZE_FOR_SIZE = no; };