Re: linux-next: build failure after merge of the rcu tree

Paul E. McKenney
2015-07-17T17:35:34Z

On Fri, Jul 17, 2015 at 01:40:46PM +0200, Ingo Molnar wrote:
>
> * Paul E. McKenney <paulmck@linux.vnet.ibm.com> wrote:
>
> > On Thu, Jul 16, 2015 at 01:14:23PM +1000, Stephen Rothwell wrote:
> > > Hi Paul,
> > >
> > > After merging the rcu tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > kernel/notifier.c: In function 'notify_die':
> > > kernel/notifier.c:547:2: error: implicit declaration of function 'rcu_lockdep_assert' [-Werror=implicit-function-declaration]
> > > rcu_lockdep_assert(rcu_is_watching(),
> > > ^
> > >
> > > Caused by commit
> > >
> > > 02300fdb3e5f ("rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()")
> > >
> > > interacting with commit
> > >
> > > e727c7d7a11e ("notifiers, RCU: Assert that RCU is watching in notify_die()")
> > >
> > > [ and I also noted
> > > 0333a209cbf6 ("x86/irq, context_tracking: Document how IRQ context tracking works and add an RCU assertion")
> > > ]
> > >
> > > from the tip tree.
> >
> > Thank you in both cases! I suspect that more will follow, so is there
> > something I can do to make this easier? (Hard for me to patch stuff
> > that is not yet in the tree...)
>
> So we could keep the old macro around as well for such cases, and then remove it
> in v4.4 or so?

Works for me! Will do.

Thanx, Paul