[PATCH 2/2] kernel: cobalt: Remove header file for newer kernels

Jan Kiszka jan.kiszka at siemens.com
Wed Jan 27 07:14:28 CET 2021


On 27.01.21 06:43, 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 <greg at 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>
> 

How about fixing arm as well at this chance? Same pattern.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux



More information about the Xenomai mailing list