From db405096bd7fb52656fc53f7c5ee87e7fe2f99c9 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Mon, 8 Nov 2021 22:10:32 +0100
Subject: [PATCH] Move the futex2-specific config changes to the futex2 patcher
 block

Fixes https://github.com/Frogging-Family/linux-tkg/commit/45517faaf93e75f792a4065c6f17546da39337be
Fixes https://github.com/Frogging-Family/linux-tkg/commit/ccae6ec83d4724134b82762bfb7da59bff5ca954
---
 linux-tkg-config/prepare | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index e6f9b7b..2780ac6 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -1119,12 +1119,8 @@ _tkg_srcprep() {
       _msg="Patching futex2 support"
       _tkg_patcher
       _enable "FUTEX2"
-    fi
-  fi
-
-  if [ "$_futex2" = "true" ] && [ -e "$srcdir/0007-v${_basekernel}-futex2_interface.patch" ]; then
-    sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config
-    echo -e "\r# start of config expert\r
+      sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config
+      echo -e "\r# start of config expert\r
 # CONFIG_DEBUG_RSEQ is not set\r
 # CONFIG_PC104 is not set\r
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set\r
@@ -1209,6 +1205,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r
 # CONFIG_TRIM_UNUSED_KSYMS is not set\r
 # CONFIG_VMLINUX_MAP is not set\r
 # end of config expert\n">> ./.config
+    fi
   fi
 
   # winesync support