CCF_100/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux58-rc-tkg: RC3

Browse Source
This commit is contained in:
Tk-Glitch
2020-06-29 03:12:13 +02:00
parent 8507c0cff9
commit 1155b489e0
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
View File

@@ -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: */