Merge tag 'sched-urgent-2023-09-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 5b47b5766b21 · 2023-09-22T12:16:46.000-07:00
Pull scheduler fix from Ingo Molnar:
 "Fix a PF_IDLE initialization bug that generated warnings on tiny-RCU"

* tag 'sched-urgent-2023-09-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  kernel/sched: Modify initial boot task idle setup
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
@@ -9269,7 +9269,7 @@ void __init init_idle(struct task_struct *idle, int cpu)
 	 * PF_KTHREAD should already be set at this point; regardless, make it
 	 * look like a proper per-CPU kthread.
 	 */
-	idle->flags |= PF_IDLE | PF_KTHREAD | PF_NO_SETAFFINITY;
+	idle->flags |= PF_KTHREAD | PF_NO_SETAFFINITY;
 	kthread_set_per_cpu(idle, cpu);
 
 #ifdef CONFIG_SMP
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
@@ -373,6 +373,7 @@ EXPORT_SYMBOL_GPL(play_idle_precise);
 
 void cpu_startup_entry(enum cpuhp_state state)
 {
+	current->flags |= PF_IDLE;
 	arch_cpu_idle_prepare();
 	cpuhp_online_idle(state);
 	while (1)

Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,7 @@ EXPORT_SYMBOL_GPL(play_idle_precise);`
`373`	`373`
`374`	`374`	`void cpu_startup_entry(enum cpuhp_state state)`
`375`	`375`	`{`
	`376`	`+ current->flags \|= PF_IDLE;`
`376`	`377`	`arch_cpu_idle_prepare();`
`377`	`378`	`cpuhp_online_idle(state);`
`378`	`379`	`while (1)`