Re: linux-evl 7.2 compilation without SMP

[Philippe Gerum <rpm@xenomai.org>]

Martínek Petr <petr.martinek@elvac.eu> writes:

> It is not possible to compile linux-evl 7.2 without SMP due to bad port of
> include/linux/spinlock_api_up.h code and kernel/irq/pipeline.c
> pipeline_percpu_data being inside define for SMP, while being used without it.
> Included are patches to fix compilation.
>
> Signed-off-by: Petr Martínek <petr.martinek@elvac.eu>
> ---
> diff -Naur a/include/linux/spinlock_api_up.h b/include/linux/spinlock_api_up.h
> --- a/include/linux/spinlock_api_up.h	2026-09-23 08:39:20.000000000 +0200
> +++ b/include/linux/spinlock_api_up.h	2026-10-08 14:21:40.410814000 +0200
> @@ -62,22 +62,22 @@
>    do { local_irq_restore(flags); __UNLOCK(lock, ##__VA_ARGS__); } while (0)
>  
>  #define __HARD_LOCK(lock) \
> -  do { ___LOCK_##__VA_ARGS__(lock); } while (0)
> +  do { ___LOCK_(lock); } while (0)
>  
>  #define __HARD_LOCK_IRQ(lock) \
> -  do { hard_local_irq_disable(); __HARD_LOCK(lock, ##__VA_ARGS__); } while (0)
> +  do { hard_local_irq_disable(); __HARD_LOCK(lock); } while (0)
>  
>  #define __HARD_LOCK_IRQSAVE(lock, flags) \
> -  do { flags = hard_local_irq_save(); __HARD_LOCK(lock, ##__VA_ARGS__); } while (0)
> +  do { flags = hard_local_irq_save(); __HARD_LOCK(lock); } while (0)
>  
>  #define __HARD_UNLOCK(lock) \
> -  do { ___UNLOCK_##__VA_ARGS__(lock); } while (0)
> +  do { ___UNLOCK_(lock); } while (0)
>  
>  #define __HARD_UNLOCK_IRQ(lock) \
> -  do { hard_local_irq_enable(); __HARD_UNLOCK(lock, ##__VA_ARGS__); } while (0)
> +  do { hard_local_irq_enable(); __HARD_UNLOCK(lock); } while (0)
>  
>  #define __HARD_UNLOCK_IRQRESTORE(lock, flags) \
> -  do { hard_local_irq_restore(flags); __HARD_UNLOCK(lock, ##__VA_ARGS__); } while (0)
> +  do { hard_local_irq_restore(flags); __HARD_UNLOCK(lock); } while (0)
>  
>  #define _raw_spin_lock(lock)			__LOCK(lock)
>  #define _raw_spin_lock_nested(lock, subclass)	__LOCK(lock)
> diff -Naur a/kernel/irq/pipeline.c b/kernel/irq/pipeline.c
> --- a/kernel/irq/pipeline.c	2026-09-23 08:39:20.000000000 +0200
> +++ b/kernel/irq/pipeline.c	2026-10-08 14:30:08.315420000 +0200
> @@ -75,6 +75,9 @@
>  	unsigned long flat[IRQ_FLAT_MAPSZ];
>  };
>  
> +struct pipeline_percpu_data { };
> +static DEFINE_PER_CPU(struct pipeline_percpu_data, pipeline_percpu_data);
> +
>  #ifdef CONFIG_SMP
>  
>  static struct irq_event_map bootup_irq_map __initdata;
> @@ -92,9 +95,6 @@
>  	},
>  };
>  
> -struct pipeline_percpu_data { };
> -static DEFINE_PER_CPU(struct pipeline_percpu_data, pipeline_percpu_data);
> -
>  static irqreturn_t smp_call_function_ipi_handler(int irq, void *dev_id)
>  {
>  	smp_flush_oob_call_function_queue();

This one slipped through the cracks. Merged, thanks.

-- 
Philippe.