The following commit has been merged into the sched/urgent branch of tip: Commit-ID: bc2d9d93ad336edce50ee4a52229076addb8fcdc Gitweb: https://git.kernel.org/tip/bc2d9d93ad336edce50ee4a52229076addb8fcdc Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 10 Jun 2020 12:14:09 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 23 Jun 2020 10:30:57 +02:00
sched/core: Fix CONFIG_GCC_PLUGIN_RANDSTRUCT build fail As a temporary build fix, the proper cleanup needs more work. Reported-by: Guenter Roeck <[email protected]> Reported-by: Eric Biggers <[email protected]> Suggested-by: Eric Biggers <[email protected]> Suggested-by: Kees Cook <[email protected]> Fixes: a148866489fb ("sched: Replace rq::wake_list") Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> --- include/linux/sched.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index b62e6aa..224b5de 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: */
