about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-01-07 14:26:12 +0100
committerAlyssa Ross <hi@alyssa.is>2024-01-11 10:53:47 +0100
commit1d6f702f95be65ad48718b2b28dfb213efdf906f (patch)
tree1ff61a1bdeb02f80252119d0c31b99a1b19f0bbf /pkgs/os-specific/linux/kernel/common-config.nix
parent98c8fa3761d844ff892ffe93395eb058fc0dab1d (diff)
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")
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 06668abdccc7b..4108faf42213a 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;
     };