[PATCH] arm64: sysreg: Drag linux/kconfig.h to work around vdso build issue
Will Deacon
will at kernel.org
Tue May 27 06:15:24 PDT 2025
On Fri, May 23, 2025 at 06:02:08PM +0100, Marc Zyngier wrote:
> Broonie reports that fed55f49fad18 ("arm64: errata: Work around
> AmpereOne's erratum AC04_CPU_23") breaks one of the vdso selftests
> (vdso_test_chacha) as it indirectly drags asm/sysreg.h.
>
> It is rather unfortunate (and worrying) that userspace gets built
> with non-UAPI headers. In any case, paper over the issue by dragging
> linux/kconfig.h in asm/sysreg.h. It is the right thing to do, at
> least from the kernel perspective.
>
> Reported-by: Mark Brown <broonie at kernel.org>
> Signed-off-by: Marc Zyngier <maz at kernel.org>
> Fixes: fed55f49fad18 ("arm64: errata: Work around AmpereOne's erratum AC04_CPU_23")
> Link: https://lore.kernel.org/r/aDCDGZ-G-nCP3hJI@finisterre.sirena.org.uk
> Cc: D Scott Phillips <scott at os.amperecomputing.com>
> Cc: Catalin Marinas <catalin.marinas at arm.com>
> Cc: Oliver Upton <oliver.upton at linux.dev>
> Cc: Will Deacon <will at kernel.org>
> ---
> arch/arm64/include/asm/sysreg.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index cd853801a8f7b..f1bb0d10c39a3 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -12,6 +12,7 @@
> #include <linux/bits.h>
> #include <linux/stringify.h>
> #include <linux/kasan-tags.h>
> +#include <linux/kconfig.h>
>
> #include <asm/gpr-num.h>
Marc, it will be quickest for you to take this as you also took the
AC04_CPU_23 workaround:
Acked-by: Will Deacon <will at kernel.org>
Will
More information about the linux-arm-kernel
mailing list