Re: [PATCH 42/50] sem: Split out sem_types.h

[Kent Overstreet]

On Wed, Dec 20, 2023 at 12:53:46PM +0100, Geert Uytterhoeven wrote:
> Hi Kent,
> 
> On Sat, Dec 16, 2023 at 4:37 AM Kent Overstreet
> <kent.overstreet@xxxxxxxxx> wrote:
> > More sched.h dependency pruning.
> >
> > Signed-off-by: Kent Overstreet <kent.overstreet@xxxxxxxxx>
> 
> Thanks for your patch, which is now commit eb72d60ccaed883a ("sem:
> Split out sem_types.h") in next-20231220.
> 
> $ make ARCH=m68k defconfig arch/m68k/kernel/asm-offsets.i
> *** Default configuration is based on 'multi_defconfig'
> #
> # No change to .config
> #
>   UPD     include/config/kernel.release
>   UPD     include/generated/utsrelease.h
>   CC      arch/m68k/kernel/asm-offsets.s
> In file included from arch/m68k/kernel/asm-offsets.c:15:
> ./include/linux/sched.h:551:3: error: conflicting types for
> ‘____cacheline_aligned’
>   551 | } ____cacheline_aligned;
>       |   ^~~~~~~~~~~~~~~~~~~~~
> ./include/linux/sched.h:509:3: note: previous declaration of
> ‘____cacheline_aligned’ was here
>   509 | } ____cacheline_aligned;
>       |   ^~~~~~~~~~~~~~~~~~~~~
> make[3]: *** [scripts/Makefile.build:116:
> arch/m68k/kernel/asm-offsets.s] Error 1
> make[2]: *** [Makefile:1191: prepare0] Error 2
> make[1]: *** [Makefile:350: __build_one_by_one] Error 2
> make: *** [Makefile:234: __sub-make] Error 2

Is this a build failure on linux-next, or that specific commit?

It looks like this should be fixed in a later commit that includes
cache.h in sched.h; I'll move that include back to this patch.