From 94f09de863c3600891db7e8f5a7a797f5b770eaa Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 25 Sep 2024 09:28:36 +0000
Subject: [PATCH] moby: kernel: remove config options which are already
 defaults

that is, this should not trigger any rebuilds
---
 .../linux-sane-pinephonepro/default.nix          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/additional/linux-sane-pinephonepro/default.nix b/pkgs/additional/linux-sane-pinephonepro/default.nix
index 1f5f6faec..720c65759 100644
--- a/pkgs/additional/linux-sane-pinephonepro/default.nix
+++ b/pkgs/additional/linux-sane-pinephonepro/default.nix
@@ -96,8 +96,8 @@ linux_latest.override {
         # this is required for boot (but why??)
         SHUFFLE_PAGE_ALLOCATOR = lib.mkForce no;
 
-        # this is required for boot (but why??)
-        TRANSPARENT_HUGEPAGE_ALWAYS = lib.mkForce yes;
+        # this is required for boot (but autoModules gets that for us)
+        # TRANSPARENT_HUGEPAGE_ALWAYS = lib.mkForce yes;
 
         # this is required for boot
         SYSFB_SIMPLEFB = lib.mkForce no;
@@ -151,7 +151,7 @@ linux_latest.override {
         # TODO: at least one of these is required for boot
         NO_HZ_IDLE = yes;
         NO_HZ_FULL = lib.mkForce no;
-        CONTEXT_TRACKING_USER = no;
+        # CONTEXT_TRACKING_USER = no;
         TICK_CPU_ACCOUNTING = yes;
         VIRT_CPU_ACCOUNTING = no;
         TASKS_RCU = yes;
@@ -177,7 +177,7 @@ linux_latest.override {
         LOGO = lib.mkForce yes;
         LOGO_LINUX_CLUT224 = yes;
         POWERCAP = lib.mkForce no;
-        CPUMASK_OFFSTACK = no;
+        # CPUMASK_OFFSTACK = no;
         # or maybe this?
         HID_BPF = lib.mkForce no;
 
@@ -216,7 +216,7 @@ linux_latest.override {
         # EXTCON_USBC_CROS_EC = yes;
 
         # TODO: at least one of these is required for boot
-        UNINLINE_SPIN_UNLOCK = yes;  #< DOESN'T TAKE EFFECT
+        # UNINLINE_SPIN_UNLOCK = yes;  #< DOESN'T TAKE EFFECT
         CMA_SIZE_MBYTES = lib.mkForce (freeform "256");
         SOFTLOCKUP_DETECTOR_INTR_STORM = no;
         LDM_PARTITION = lib.mkForce no;
@@ -235,10 +235,10 @@ linux_latest.override {
         TLS = lib.mkForce no;
         XDP_SOCKETS_DIAG = lib.mkForce no;
         IP_PNP = lib.mkForce yes;
-        IP_PNP_DHCP = yes;
-        IP_PNP_BOOTP = yes;
+        # IP_PNP_DHCP = yes;
+        # IP_PNP_BOOTP = yes;
         IP_DCCP_CCID3 = lib.mkForce yes;
-        IP_DCCP_TFRC_LIB = yes;
+        # IP_DCCP_TFRC_LIB = yes;
         RTW88 = lib.mkForce no;
         MEDIA_CEC_RC = lib.mkForce no;
         CRYPTO_TEST = lib.mkForce module;