diff --git a/linux58-tkg/PKGBUILD b/linux58-tkg/PKGBUILD
index 9febdae..3e06cf9 100644
--- a/linux58-tkg/PKGBUILD
+++ b/linux58-tkg/PKGBUILD
@@ -43,7 +43,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -75,7 +75,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         #0008-5.8-bcachefs.patch
         0009-glitched-ondemand-bmq.patch
         0009-glitched-bmq.patch
-        0009-prjc_v5.8-r0.patch
+        0009-prjc_v5.8-r1.patch
         0011-ZFS-fix.patch
         #0012-linux-hardened.patch
         0012-misc-additions.patch
@@ -97,7 +97,7 @@ sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
             'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
             '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
             '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
-            'aa02d8dc476093eec104020bca4e47b0684381f3aa7d3caeb50c6b195c19a02f'
+            '1656a20d3bab28c72e004778f77e880bba8d02eba8d18a81558cdc9d6733b1f1'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
             '98311deeb474b39e821cd1e64198793d5c4d797155b3b8bbcb1938b7f11e8d74')
 
diff --git a/linux58-tkg/linux58-tkg-config/prepare b/linux58-tkg/linux58-tkg-config/prepare
index 68af487..ff6e9a7 100644
--- a/linux58-tkg/linux58-tkg-config/prepare
+++ b/linux58-tkg/linux58-tkg-config/prepare
@@ -192,7 +192,7 @@ _tkg_srcprep() {
     # Project C / BMQ
     msg2 "Applying Project C / BMQ base patch"
 
-    patch -Np1 -i "$srcdir"/0009-prjc_v5.8-r0.patch
+    patch -Np1 -i "$srcdir"/0009-prjc_v5.8-r1.patch
 
     if [ "${_aggressive_ondemand}" = "true" ]; then
       msg2 "Applying BMQ agressive ondemand governor patch"
diff --git a/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r0.patch b/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r1.patch
similarity index 99%
rename from linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r0.patch
rename to linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r1.patch
index 5832fcc..3c6ad20 100644
--- a/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r0.patch
+++ b/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r1.patch
@@ -611,10 +611,10 @@ index 5fc9c9b70862..eb6d7d87779f 100644
  obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
 diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
 new file mode 100644
-index 000000000000..0a75a830de05
+index 000000000000..5db1f74f3559
 --- /dev/null
 +++ b/kernel/sched/alt_core.c
-@@ -0,0 +1,6200 @@
+@@ -0,0 +1,6202 @@
 +/*
 + *  kernel/sched/alt_core.c
 + *
@@ -758,7 +758,9 @@ index 000000000000..0a75a830de05
 +
 +#define IDLE_WM	(IDLE_TASK_SCHED_PRIO)
 +
++#ifdef CONFIG_SCHED_SMT
 +static cpumask_t sched_sg_idle_mask ____cacheline_aligned_in_smp;
++#endif
 +static cpumask_t sched_rq_watermark[SCHED_BITS] ____cacheline_aligned_in_smp;
 +
 +static inline void update_sched_rq_watermark(struct rq *rq)
@@ -6456,12 +6458,12 @@ index 000000000000..0a75a830de05
 +#ifdef CONFIG_SCHED_SMT
 +		rq->active_balance = 0;
 +#endif
-+#endif
-+		rq->nr_switches = 0;
 +
 +#ifdef CONFIG_NO_HZ_COMMON
 +		rq_csd_init(rq, &rq->nohz_csd, nohz_csd_func);
 +#endif
++#endif /* CONFIG_SMP */
++		rq->nr_switches = 0;
 +
 +		hrtick_rq_init(rq);
 +		atomic_set(&rq->nr_iowait, 0);
@@ -7434,11 +7436,11 @@ index 000000000000..aba3c98759f8
 +#endif
 diff --git a/kernel/sched/bmq_imp.h b/kernel/sched/bmq_imp.h
 new file mode 100644
-index 000000000000..e581fbf3528b
+index 000000000000..86d496ec23b3
 --- /dev/null
 +++ b/kernel/sched/bmq_imp.h
 @@ -0,0 +1,86 @@
-+#define ALT_SCHED_VERSION_MSG "sched/bmq: BMQ CPU Scheduler 5.8-r0 by Alfred Chen.\n"
++#define ALT_SCHED_VERSION_MSG "sched/bmq: BMQ CPU Scheduler 5.8-r1 by Alfred Chen.\n"
 +
 +static inline void sched_queue_init(struct rq *rq)
 +{
@@ -7674,10 +7676,10 @@ index b4b1ff96642f..b7e99a169b79 100644
  #ifdef CONFIG_SCHED_THERMAL_PRESSURE
  /*
 diff --git a/kernel/sched/pelt.h b/kernel/sched/pelt.h
-index eb034d9f024d..49aa805750c5 100644
+index eb034d9f024d..7fefc89b377a 100644
 --- a/kernel/sched/pelt.h
 +++ b/kernel/sched/pelt.h
-@@ -1,11 +1,13 @@
+@@ -1,13 +1,15 @@
  #ifdef CONFIG_SMP
  #include "sched-pelt.h"
  
@@ -7689,8 +7691,11 @@ index eb034d9f024d..49aa805750c5 100644
  int update_dl_rq_load_avg(u64 now, struct rq *rq, int running);
 +#endif
  
- #ifdef CONFIG_SCHED_THERMAL_PRESSURE
+-#ifdef CONFIG_SCHED_THERMAL_PRESSURE
++#if defined(CONFIG_SCHED_THERMAL_PRESSURE) && !defined(CONFIG_SCHED_ALT)
  int update_thermal_load_avg(u64 now, struct rq *rq, u64 capacity);
+ 
+ static inline u64 thermal_load_avg(struct rq *rq)
 @@ -37,6 +39,7 @@ update_irq_load_avg(struct rq *rq, u64 running)
  }
  #endif
@@ -7985,32 +7990,3 @@ index b5e3496cf803..cfbae0a21cef 100644
  	};
  	struct wakeup_test_data *x = data;
  
-diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
-index 0a75a830de0586e306868b07a650092897f42af1..5db1f74f35592f9fe087fe3689daf127fa5b3ffc 100644
---- a/kernel/sched/alt_core.c
-+++ b/kernel/sched/alt_core.c
-@@ -141,7 +141,9 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
- 
- #define IDLE_WM	(IDLE_TASK_SCHED_PRIO)
- 
-+#ifdef CONFIG_SCHED_SMT
- static cpumask_t sched_sg_idle_mask ____cacheline_aligned_in_smp;
-+#endif
- static cpumask_t sched_rq_watermark[SCHED_BITS] ____cacheline_aligned_in_smp;
- 
- static inline void update_sched_rq_watermark(struct rq *rq)
-@@ -5839,12 +5841,12 @@ void __init sched_init(void)
- #ifdef CONFIG_SCHED_SMT
- 		rq->active_balance = 0;
- #endif
--#endif
--		rq->nr_switches = 0;
- 
- #ifdef CONFIG_NO_HZ_COMMON
- 		rq_csd_init(rq, &rq->nohz_csd, nohz_csd_func);
- #endif
-+#endif /* CONFIG_SMP */
-+		rq->nr_switches = 0;
- 
- 		hrtick_rq_init(rq);
- 		atomic_set(&rq->nr_iowait, 0);