]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
sched/core: Fix CONFIG_GCC_PLUGIN_RANDSTRUCT build fail
authorPeter Zijlstra <peterz@infradead.org>
Wed, 10 Jun 2020 10:14:09 +0000 (12:14 +0200)
committerBorislav Petkov <bp@suse.de>
Sun, 28 Jun 2020 15:01:20 +0000 (17:01 +0200)
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>
include/linux/sched.h

index b62e6aaf28f0318455f47c047c307cb6441fdd53..224b5de568e7e85033997ed735b5ace87ba0ed90 100644 (file)
@@ -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: */