From 1155b489e04499cd4c9ced2a6dcc36453307fea8 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Mon, 29 Jun 2020 03:12:13 +0200
Subject: [PATCH] linux58-rc-tkg: RC3

---
 linux58-rc-tkg/PKGBUILD                       |  6 ++---
 .../0005-v5.8_undead-pds099o.patch            | 24 ++++---------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/linux58-rc-tkg/PKGBUILD b/linux58-rc-tkg/PKGBUILD
index 6833b73..900860c 100644
--- a/linux58-rc-tkg/PKGBUILD
+++ b/linux58-rc-tkg/PKGBUILD
@@ -82,7 +82,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 _basekernel=5.8
-_sub=rc2
+_sub=rc3
 pkgver="${_basekernel}"."${_sub}"
 pkgrel=1
 pkgdesc='Linux-tkg'
@@ -119,7 +119,7 @@ source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
         0011-ZFS-fix.patch
         #0012-linux-hardened.patch
 )
-sha256sums=('096c637e492f25379c2130291b0cf938e7fff14206dd530b1f55b2ba54b9c40f'
+sha256sums=('3b983f9c93c791424e4d0894031625d1d6b5ec04ec09a09de0248b374329ef05'
             '5ab29eb64e57df83b395a29a6a4f89030d142feffbfbf73b3afc6d97a2a7fd12'
             '1bfe5ec855c8774f9cade253c0770d3691295ed03f4707abc76b0f29bb6fd67b'
             '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
@@ -130,7 +130,7 @@ sha256sums=('096c637e492f25379c2130291b0cf938e7fff14206dd530b1f55b2ba54b9c40f'
             '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
             '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
             '7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74'
-            '8b84d006888c9f91c294ebff2741b250126a33dee8aeceea2ae12e6f714b806c'
+            '709c93c6b7ae1f98711314d5eaec39f7f957472d45a39f0e3684bfd829d53a83'
             '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
             'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
diff --git a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
index 8be7282..ca7213a 100644
--- a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
+++ b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
@@ -192,21 +192,6 @@ diff --git a/kernel/smp.c b/kernel/smp.c
 index 4418f5cb8324..2b51afac5b06 100644
 --- a/kernel/smp.c
 +++ b/kernel/smp.c
-@@ -669,12 +669,14 @@ void __init smp_init(void)
- 	BUILD_BUG_ON(offsetof(struct irq_work, flags) !=
- 		     offsetof(struct __call_single_data, flags));
- 
-+#ifndef CONFIG_SCHED_PDS
- 	/*
- 	 * Assert the CSD_TYPE_TTWU layout is similar enough
- 	 * for task_struct to be on the @call_single_queue.
- 	 */
- 	BUILD_BUG_ON(offsetof(struct task_struct, wake_entry_type) - offsetof(struct task_struct, wake_entry) !=
- 		     offsetof(struct __call_single_data, flags) - offsetof(struct __call_single_data, llist));
-+#endif /* !CONFIG_SCHED_PDS */
- 
- 	idle_threads_init();
- 	cpuhp_threads_init();
 diff --git a/include/linux/sched.h b/include/linux/sched.h
 index 4418f5cb8324..2b51afac5b06 100644
 --- a/include/linux/sched.h
@@ -219,18 +204,17 @@ index 4418f5cb8324..2b51afac5b06 100644
  
  /* task_struct member predeclarations (sorted alphabetically): */
  struct audit_context;
-@@ -652,10 +653,14 @@ struct task_struct {
+@@ -652,9 +653,13 @@ struct task_struct {
  	unsigned int			flags;
  	unsigned int			ptrace;
  
 -#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) && !defined(CONFIG_SCHED_PDS)
- 	struct llist_node		wake_entry;
- 	unsigned int			wake_entry_type;
-+#endif
 +#if defined(CONFIG_SMP) || defined(CONFIG_SCHED_PDS)
  	int				on_cpu;
 +#endif
++#if defined(CONFIG_SMP) && !defined(CONFIG_SCHED_PDS)
+ 	struct __call_single_node	wake_entry;
++#endif
 +#ifdef CONFIG_SMP
  #ifdef CONFIG_THREAD_INFO_IN_TASK
  	/* Current CPU: */