Re: linux-next: build failure after merge of the rcu tree
From: Paul E. McKenney
Date: Thu Apr 22 2021 - 12:36:49 EST
On Thu, Apr 22, 2021 at 02:10:16PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the rcu tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from kernel/rcu/update.c:584:
> kernel/rcu/tasks.h:1404:20: error: static declaration of 'show_rcu_tasks_gp_kthreads' follows non-static declaration
> 1404 | static inline void show_rcu_tasks_gp_kthreads(void) {}
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from kernel/rcu/update.c:49:
> kernel/rcu/rcu.h:440:6: note: previous declaration of 'show_rcu_tasks_gp_kthreads' was here
> 440 | void show_rcu_tasks_gp_kthreads(void);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 4bf02dd6048d ("tasks-rcu: Make show_rcu_tasks_gp_kthreads() be static inline")
>
> I have used the rcu tree from next-20210421 for today.
Well, that is one commit that isn't going into the upcoming merge window!
I have (allegedly) fixed it with attribution, but also moved it out of
my -next pile. I will update rcu/next after a quick round of tests.
Apologies for the hassle!
Thanx, Paul