Skip to contentSkip to conversation

smpboot: remove duplicate inline keyword

PATCH In review Arnd Bergmann 2 participants 2 messages Jul 23, 2021 CPU hotplug

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 smpboot: remove duplicate inline keyword

From: Arnd Bergmann <[email protected]>

'static inline void __always_inline' is one more 'inline' than needed, and it's in the wrong place as gcc points out when extra warnings are enabled:

kernel/smpboot.c:50:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration]
50 | static inline void __always_inline idle_init(unsigned int cpu)

Move it to the right place instead.

Fixes e9ba16e68cce ("smpboot: Mark idle_init() as __always_inlined to work around aggressive compiler un-inlining")
---
 kernel/smpboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/smpboot.c +1 -1
index 21b7953f8242..cf6acab78538 100644
@@ -47,7 +47,7 @@ void __init idle_thread_set_boot_cpu(void)
  *
  * Creates the thread if it does not exist.
  */
-static inline void __always_inline idle_init(unsigned int cpu)
+static __always_inline void idle_init(unsigned int cpu)
 {
 	struct task_struct *tsk = per_cpu(idle_threads, cpu);
 
Signature · 1 line
2.29.2
#1 lore raw

Hi,

Quoted 6 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

'static inline void __always_inline' is one more 'inline' than needed, and it's in the wrong place as gcc points out when extra warnings are enabled:

Quoted 7 lines

kernel/smpboot.c:50:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration]
50 | static inline void __always_inline idle_init(unsigned int cpu)

Move it to the right place instead.

Fixes e9ba16e68cce ("smpboot: Mark idle_init() as __always_inlined to work around aggressive compiler un-inlining")

Colin sent a similar fix at:

http://lore.kernel.org/r/[email protected]

Now AFAICT the incriminated patch is in tip/core/urgent and linux-next/master, but not in the current mainline. If so, this could be fixed up before it gets pulled.