From 356f21b2e00b9537bce7d0d43a3abbd33d76d230 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 11 Aug 2022 19:45:03 +0800
Subject: [PATCH 1/2] linux_xanmod: only apply fix for removed options on tt
 variant

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 53b00b93358a..55ba9e7bd392 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -5,20 +5,23 @@ let
   ltsVariant = {
     version = "5.15.60";
     hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs=";
+    variant = "lts";
   };
 
   edgeVariant = {
     version = "5.19.1";
     hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ=";
+    variant = "edge";
   };
 
   ttVariant = {
     version = "5.15.54";
     suffix = "xanmod1-tt";
     hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
+    variant = "tt";
   };
 
-  xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
+  xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
     inherit version;
     modDirVersion = "${version}-${suffix}";
 
@@ -30,11 +33,6 @@ let
     };
 
     structuredExtraConfig = with lib.kernel; {
-      # removed options
-      CFS_BANDWIDTH = lib.mkForce (option no);
-      RT_GROUP_SCHED = lib.mkForce (option no);
-      SCHED_AUTOGROUP = lib.mkForce (option no);
-
       # AMD P-state driver
       X86_AMD_PSTATE = yes;
 
@@ -67,6 +65,11 @@ let
 
       # WineSync driver for fast kernel-backed Wine
       WINESYNC = module;
+    } // lib.optionalAttrs (variant == "tt") {
+      # removed options
+      CFS_BANDWIDTH = lib.mkForce (option no);
+      RT_GROUP_SCHED = lib.mkForce (option no);
+      SCHED_AUTOGROUP = lib.mkForce (option no);
     };
 
     extraMeta = {

From f9047f4745ae02115b67e7b3becb9dfc92aac1b4 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 11 Aug 2022 22:08:54 +0800
Subject: [PATCH 2/2] linux_xanmod: remove unused kernel configs

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 55ba9e7bd392..e38db853ff45 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -41,13 +41,6 @@ let
       NTFS3_LZX_XPRESS = yes;
       NTFS3_FS_POSIX_ACL = yes;
 
-      # Preemptive Full Tickless Kernel at 500Hz
-      SCHED_CORE = lib.mkForce (option no);
-      PREEMPT_VOLUNTARY = lib.mkForce no;
-      PREEMPT = lib.mkForce yes;
-      NO_HZ_FULL = yes;
-      HZ_500 = yes;
-
       # Google's BBRv2 TCP congestion Control
       TCP_CONG_BBR2 = yes;
       DEFAULT_BBR2 = yes;
@@ -70,6 +63,7 @@ let
       CFS_BANDWIDTH = lib.mkForce (option no);
       RT_GROUP_SCHED = lib.mkForce (option no);
       SCHED_AUTOGROUP = lib.mkForce (option no);
+      SCHED_CORE = lib.mkForce (option no);
     };
 
     extraMeta = {