From f4c346e3068414ecda146622ae65a8c0f2e86663 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Thu, 3 Sep 2020 13:13:16 +0200
Subject: [PATCH] linux54-tkg: 5.4.62

---
 linux54-tkg/PKGBUILD                               | 8 ++++----
 linux54-tkg/linux54-tkg-patches/0004-5.4-ck1.patch | 9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/linux54-tkg/PKGBUILD b/linux54-tkg/PKGBUILD
index 3321325..61dc5bc 100644
--- a/linux54-tkg/PKGBUILD
+++ b/linux54-tkg/PKGBUILD
@@ -96,9 +96,9 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 _basekernel=5.4
-_sub=61
+_sub=62
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=80
+pkgrel=81
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -134,7 +134,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         0012-linux-hardened.patch
 )
 sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
-            'cf86ed5d1f77918e01331f67178ab9a9c26beb6bec0ec8bd9c7593cf8545c68c'
+            '9ce992afb4893a88c25d8dada043690d356176cca0d943091d5e2f2fcd856008'
             '27b7fc535ade94b636c3ec4e809e141831e9465a0ef55215a9852b87048629e2'
             '55dd5117c1da17c9ec38d7bc995958958bcc8b7ebcfd81de1d4c7650b85537ab'
             '1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8'
@@ -146,7 +146,7 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
             '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
             'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
             'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb'
-            '6f69af16c82ce751a873d590af65735664ba8121369face03da48507ce803a5b'
+            '815974c65f47301d2a5d1577bf95e8a4b54cad7d77f226e0065f83e763837c48'
             '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
             'eac7e5d6201528e64f4bdf5e286c842511e1afc52e1518dc8e7d11932bbe0a99'
             'db03fbd179ec78941eefe1c0edde4c19071bc603511d0b5c06c04e412994b62e'
diff --git a/linux54-tkg/linux54-tkg-patches/0004-5.4-ck1.patch b/linux54-tkg/linux54-tkg-patches/0004-5.4-ck1.patch
index dabafe5..f3fbde8 100644
--- a/linux54-tkg/linux54-tkg-patches/0004-5.4-ck1.patch
+++ b/linux54-tkg/linux54-tkg-patches/0004-5.4-ck1.patch
@@ -15665,7 +15665,7 @@ new file mode 100644
 index 000000000000..5214b158d82f
 --- /dev/null
 +++ b/kernel/sched/MuQSS.h
-@@ -0,0 +1,1005 @@
+@@ -0,0 +1,1010 @@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +#ifndef MUQSS_SCHED_H
 +#define MUQSS_SCHED_H
@@ -16441,6 +16441,11 @@ index 000000000000..5214b158d82f
 +}
 +#endif /* CONFIG_CPU_FREQ */
 +
++static inline bool uclamp_is_used(void)
++{
++	return false;
++}
++
 +static __always_inline
 +unsigned int uclamp_util_with(struct rq __maybe_unused *rq, unsigned int util,
 +			      struct task_struct __maybe_unused *p)
@@ -16691,7 +16696,7 @@ index 86800b4d5453..f3d8dca0538a 100644
 @@ -213,7 +219,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs,
  	struct rq *rq = cpu_rq(cpu);
  
- 	if (!IS_BUILTIN(CONFIG_UCLAMP_TASK) &&
+ 	if (!uclamp_is_used() &&
 -	    type == FREQUENCY_UTIL && rt_rq_is_runnable(&rq->rt)) {
 +	    type == FREQUENCY_UTIL && rt_rq_runnable(rq)) {
  		return max;