[PATCH 3/8] arm64: stacktrace: move SDEI stack helpers to stacktrace code

Mark Rutland mark.rutland at arm.com
Thu Aug 4 07:38:56 PDT 2022


On Mon, Aug 01, 2022 at 01:12:04PM +0100, Mark Rutland wrote:
> diff --git a/arch/arm64/include/asm/stacktrace.h b/arch/arm64/include/asm/stacktrace.h
> index 6ebdcdff77f56..fa2df1ea22ebc 100644
> --- a/arch/arm64/include/asm/stacktrace.h
> +++ b/arch/arm64/include/asm/stacktrace.h

> +#if defined(CONFIG_ARM_SDE_INTERFACE) && defined(CONFIG_VMAP_STACK)
> +DECLARE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);
> +DECLARE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);

> diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c
> index d20620a1c51a4..881eece3422ca 100644
> --- a/arch/arm64/kernel/sdei.c
> +++ b/arch/arm64/kernel/sdei.c
> @@ -31,9 +31,6 @@ unsigned long sdei_exit_mode;
>   * sdei stack.
>   * For now, we allocate stacks when the driver is probed.
>   */
> -DECLARE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);
> -DECLARE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);
> -

The kbuild test robot reported that removing these lines broke builds with
CONFIG_SDE_INTERFACE=y && CONFIG_VMAP_STACK=n:

  https://lore.kernel.org/r/16ba6649-d680-69d4-dbd3-3b1ffb06319b@intel.com

For now I've restored the declarations in sdei.c, as the alternative was to
make the ifdeffery in stacktrace.h more convoluted.

Thanks,
Mark.



More information about the linux-arm-kernel mailing list