Merge tag 'core-urgent-2021-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 9041a4d2ee2f · 2021-07-25T09:52:48.000-07:00
Pull core fix from Thomas Gleixner:
 "A single update for the boot code to prevent aggressive un-inlining
  which causes a section mismatch"

* tag 'core-urgent-2021-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  smpboot: Mark idle_init() as __always_inlined to work around aggressive compiler un-inlining
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
@@ -47,7 +47,7 @@ void __init idle_thread_set_boot_cpu(void)
  *
  * Creates the thread if it does not exist.
  */
-static inline void idle_init(unsigned int cpu)
+static inline void __always_inline idle_init(unsigned int cpu)
 {
 	struct task_struct *tsk = per_cpu(idle_threads, cpu);
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void __init idle_thread_set_boot_cpu(void)`
`47`	`47`	`*`
`48`	`48`	`* Creates the thread if it does not exist.`
`49`	`49`	`*/`
`50`		`-static inline void idle_init(unsigned int cpu)`
	`50`	`+static inline void __always_inline idle_init(unsigned int cpu)`
`51`	`51`	`{`
`52`	`52`	`struct task_struct *tsk = per_cpu(idle_threads, cpu);`
`53`	`53`