+Cc: Rasmus On Fri, Oct 15, 2021 at 08:29:08PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the akpm-current tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > In file included from include/linux/rcupdate.h:28, > from include/linux/rculist.h:11, > from include/linux/pid.h:5, > from include/linux/sched.h:14, > from arch/arm/kernel/asm-offsets.c:11: > include/linux/bottom_half.h: In function 'local_bh_disable': > include/linux/bottom_half.h:19:24: error: '_THIS_IP_' undeclared (first use in this function) > 19 | __local_bh_disable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); > | ^~~~~~~~~ > include/linux/bottom_half.h:19:24: note: each undeclared identifier is reported only once for each function it appears in > include/linux/bottom_half.h: In function 'local_bh_enable': > include/linux/bottom_half.h:32:23: error: '_THIS_IP_' undeclared (first use in this function) > 32 | __local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); > | ^~~~~~~~~ > > Presumably caused by a commit in the series that starts with > > dcaf7a5f413b ("kernel.h: drop unneeded <linux/kernel.h> inclusion from other headers") > > I have applied the following patch for today (though there may be a > better solution). Thanks! As a quick fix looks good, but I think we need a separate header for those _*_IP_ macros. > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Fri, 15 Oct 2021 19:58:46 +1100 > Subject: [PATCH] bottom_half.h needs kernel.h > > for _THIS_IP_ on arm at least > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > include/linux/bottom_half.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h > index eed86eb0a1de..11d107d88d03 100644 > --- a/include/linux/bottom_half.h > +++ b/include/linux/bottom_half.h > @@ -2,6 +2,7 @@ > #ifndef _LINUX_BH_H > #define _LINUX_BH_H > > +#include <linux/kernel.h> > #include <linux/preempt.h> > > #if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_TRACE_IRQFLAGS) -- With Best Regards, Andy Shevchenko