Merge 5.8-rc3 into android-mainline

Linux 5.8-rc3 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: If6fb78c619c5fa35332606589853189842c304b9
2020-06-29 10:48:10 +02:00
parent 6e23f5089d 9ebcfadb06
commit 1e253d0563
633 changed files with 5541 additions and 2987 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -654,9 +654,8 @@ struct task_struct {
 	unsigned int			ptrace;

 #ifdef CONFIG_SMP
-	struct llist_node		wake_entry;
-	unsigned int			wake_entry_type;
 	int				on_cpu;
+	struct __call_single_node	wake_entry;
 #ifdef CONFIG_THREAD_INFO_IN_TASK
 	/* Current CPU: */
 	unsigned int			cpu;