From b75cb38ac8b7383b1182f6d6765a29d02d5f4f0c Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Wed, 25 May 2022 20:26:05 +0200
Subject: [PATCH] linux54/57: Bring the fix for `error:
 include/uapi/linux/sched.h: leak CONFIG_SCHED_MUQSS to user-space` to 5.4 and
 5.7 when using MuQSS. We already had it for newer versions, but looks like
 some people are still using those old versions, hitting the issue.

Fixes https://github.com/Frogging-Family/linux-tkg/issues/526
---
 PKGBUILD                                 |  4 ++--
 linux-tkg-patches/5.4/0004-5.4-ck1.patch | 12 ++++++++++++
 linux-tkg-patches/5.7/0004-5.7-ck1.patch | 12 ++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 4f3581c..de58549 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -113,7 +113,7 @@ case $_basever in
             '9420cf1a04740956008e535725ae38a2f759188841be3776447a4eb635fa5158'
             'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
             'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb'
-            '815974c65f47301d2a5d1577bf95e8a4b54cad7d77f226e0065f83e763837c48'
+            'f3dbaa88e8a78cdfe02c0c9a77e67afd4af2c97d432fca37fbe4ef8d5121996f'
             '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
             'eac7e5d6201528e64f4bdf5e286c842511e1afc52e1518dc8e7d11932bbe0a99'
             '29f7dc8930426b9cf86742ca80623b96b97c1d92a4436ba4e2adcde5200b4c29'
@@ -163,7 +163,7 @@ case $_basever in
             '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
             'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
             'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb'
-            '8d8aec86e34dbec6cc3a47f2cd55dc9212e95d36b6cd34d6e637c66731e7d838'
+            '5464597f189781d6a2aa45b1855d6bae0f30dd74a27b1260645614a519c91b25'
             '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
             '7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74'
             '55be5e4c6254da0a9d34bbfac807a70d8b58b3f7b2ec852026195c4db5e263e2'
diff --git a/linux-tkg-patches/5.4/0004-5.4-ck1.patch b/linux-tkg-patches/5.4/0004-5.4-ck1.patch
index f3fbde8..654ec0a 100644
--- a/linux-tkg-patches/5.4/0004-5.4-ck1.patch
+++ b/linux-tkg-patches/5.4/0004-5.4-ck1.patch
@@ -17682,3 +17682,15 @@ index f70211e6b174..5ae4421225e6 100644
  	} while (--timeout > 0);
  	if (alive)
  		dev_err(line6pcm->line6->ifcdev,
+diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
+index a07668a5c36b1c..c411a6d9e9ba5c 100755
+--- a/scripts/headers_install.sh
++++ b/scripts/headers_install.sh
+@@ -94,6 +94,7 @@ include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP
+ include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
+ include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE
+ include/uapi/linux/raw.h:CONFIG_MAX_RAW_DEVS
++include/uapi/linux/sched.h:CONFIG_SCHED_MUQSS
+ "
+
+ for c in $configs
diff --git a/linux-tkg-patches/5.7/0004-5.7-ck1.patch b/linux-tkg-patches/5.7/0004-5.7-ck1.patch
index ee1d1c8..c3cdcc4 100644
--- a/linux-tkg-patches/5.7/0004-5.7-ck1.patch
+++ b/linux-tkg-patches/5.7/0004-5.7-ck1.patch
@@ -13145,3 +13145,15 @@ index 244d305443773..90b77028233b0 100644
  		.cant_stop		= true,
  	},
  	/* Final state before CPU kills itself */
+diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
+index a07668a5c36b1c..c411a6d9e9ba5c 100755
+--- a/scripts/headers_install.sh
++++ b/scripts/headers_install.sh
+@@ -94,6 +94,7 @@ include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP
+ include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
+ include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE
+ include/uapi/linux/raw.h:CONFIG_MAX_RAW_DEVS
++include/uapi/linux/sched.h:CONFIG_SCHED_MUQSS
+ "
+
+ for c in $configs