From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 10 Jun 2020 10:14:09 +0000 (+0200)
Subject: sched/core: Fix CONFIG_GCC_PLUGIN_RANDSTRUCT build fail
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4f311afc2035f7b33d97e69ffaa2e6cd67fca16d;p=linux.git

sched/core: Fix CONFIG_GCC_PLUGIN_RANDSTRUCT build fail

As a temporary build fix, the proper cleanup needs more work.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Reported-by: Eric Biggers <ebiggers@kernel.org>
Suggested-by: Eric Biggers <ebiggers@kernel.org>
Suggested-by: Kees Cook <keescook@chromium.org>
Fixes: a148866489fb ("sched: Replace rq::wake_list")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/include/linux/sched.h b/include/linux/sched.h
index b62e6aaf28f03..224b5de568e7e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -654,8 +654,10 @@ struct task_struct {
 	unsigned int			ptrace;
 
 #ifdef CONFIG_SMP
-	struct llist_node		wake_entry;
-	unsigned int			wake_entry_type;
+	struct {
+		struct llist_node		wake_entry;
+		unsigned int			wake_entry_type;
+	};
 	int				on_cpu;
 #ifdef CONFIG_THREAD_INFO_IN_TASK
 	/* Current CPU: */