[PATCH] smpboot: remove duplicate inline keyword

[PATCH] smpboot: remove duplicate inline keyword

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

'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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 kernel/smpboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 21b7953f8242..cf6acab78538 100644
--- 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 __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);
 
-- 
2.29.2

Re: [PATCH] smpboot: remove duplicate inline keyword

[Valentin Schneider]

Hi,

On 23/07/21 11:16, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> '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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Colin sent a similar fix at:

  http://lore.kernel.org/r/20210715164018.62712-1-colin.king@canonical.com

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.