Migrate to linux 6.9

jmbaur · Jun 21, 2024 · 6e11975 · 6e11975
1 parent 3430320
commit 6e11975
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/kernel-configs/x86_64.nix b/kernel-configs/x86_64.nix
@@ -11,7 +11,6 @@
       ATA_ACPI = yes;
       CMDLINE_BOOL = yes;
       CPU_MITIGATIONS = yes;
-      CPU_SRSO = yes;
       CPU_SUP_AMD = yes;
       CRYPTO_SHA256_SSSE3 = yes;
       CRYPTO_SHA512_SSSE3 = yes;
@@ -27,12 +26,13 @@
       KERNEL_XZ = yes;
       MFD_INTEL_LPSS_ACPI = yes;
       MFD_INTEL_LPSS_PCI = yes;
+      MITIGATION_RETHUNK = yes;
+      MITIGATION_RETPOLINE = yes;
+      MITIGATION_SRSO = yes;
       MTRR = yes;
       PCI_MSI = yes;
       PNP = yes;
       PREEMPT_VOLUNTARY = yes;
-      RETHUNK = yes;
-      RETPOLINE = yes;
       RTC_DRV_CMOS = yes;
       SERIAL_8250 = yes;
       SERIAL_8250_CONSOLE = yes;

diff --git a/options.nix b/options.nix
@@ -138,7 +138,7 @@ in
     linux = {
       package = mkOption {
         type = types.package;
-        default = pkgs.linux_6_8;
+        default = pkgs.linux_6_9;
       };
       consoles = mkOption {
         type = types.listOf types.str;