[linux-yocto] [PATCH] kernel/softirq.c error in 4.9.65 tag

[Bruce Ashfield]

On 2017-12-08 1:05 PM, Daniel Dragomir wrote:
> Hello Bruce!
> 
> Can you please review this patch and merge it in Axxia preempt-rt
> branch from linux-yocto-4.9 if it's good:
> standard/preempt-rt/axxia/base
> 
> After you have merged tag 4.9.65 tag from upstream in yocto branches
> and also in Axxia ones, our preempt-rt build is failing with the
> following error:
> 
> | kernel/softirq.c:615:28: error: macro "in_serving_softirq" passed
> | 1 arguments, but takes just 0
> | kernel/softirq.c:616:1: error: expected '=', ',', ';', 'asm' or
> | '__attribute__' before '{' token
> | scripts/Makefile.build:293: recipe for target 'kernel/softirq.o'
> | failed
> 
> After searching the commits, I found that it's a duplication of
> defining in_serving_softirq macro in include/linux/preempt.h.
> I think it's merge issue. See details in commit log.
> 
> If you can confirm tis issue, maybe this should be fixed also in
> other preempt-rt branches, including standard/preempt-rt/base.

Yep. It was your run of the mill merge issue.

I've merged this to all the preempt-rt branches and will send
SRCREV updates early next week.

Bruce

> 
> Best regards,
> Daniel Dragomir (1):
>    softirq: Remove duplication of defining in_serving_softirq macro
> 
>   include/linux/preempt.h | 1 -
>   1 file changed, 1 deletion(-)
>