On Fri, Feb 5, 2021 at 9:45 AM Jan Kiszka <jan.kis...@siemens.com> wrote:
> On 03.02.21 10:50, Jan Kiszka via Xenomai wrote: > > On 03.02.21 08:01, Greg Gallagher via Xenomai wrote: > >> 5.4 kernels do not have compiler.h, only include this header file for > kernels older then 5.4 > >> > >> Signed-off-by: Greg Gallagher <g...@embeddedgreg.com> > >> --- > >> kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h | 4 ++++ > >> 1 file changed, 4 insertions(+) > >> > >> diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h > b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h > >> index 7444cc823..17be10339 100644 > >> --- a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h > >> +++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h > >> @@ -29,7 +29,11 @@ > >> #define XNARCH_HOST_TICK_IRQ __ipipe_hrtimer_irq > >> > >> #include <asm/barrier.h> > >> + > >> +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) > >> #include <asm/compiler.h> > >> +#endif > >> + > >> #include <asm/cmpxchg.h> > >> #include <asm/switch_to.h> > >> #include <asm/system_misc.h> > >> > > > > There is still arch/arm64/include/asm/compiler.h in today's master. > > > > What error exactly are you fixing? That we should rather including > > linux/compiler.h? Or is that header obsolete for us now, for all kernels? > > > > OK, that file vanished in 4.20 and resurrected in 5.7. Given that we do > not head for ipipe over > 5.4, I will just merge this (ported to next). > > Jan > > -- > Siemens AG, T RDA IOT > Corporate Competence Center Embedded Linux Sorry, I meant to look into that. I’m assuming this won’t impact the port to dovetail? We could always add it back for kernels greater then 5.6 and remove for 4.20 and above? Greg > >
