From: Marc Zyngier Date: Fri, 23 May 2025 17:02:08 +0000 (+0100) Subject: arm64: sysreg: Drag linux/kconfig.h to work around vdso build issue X-Git-Tag: v6.16-rc1~78^2^2~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=94d889713d8b8e3bb78e19a1bbe76e36e34e8113;p=linux-block.git arm64: sysreg: Drag linux/kconfig.h to work around vdso build issue 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 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 Cc: Catalin Marinas Cc: Oliver Upton Cc: Will Deacon Reviewed-by: Oliver Upton Acked-by: Will Deacon Link: https://lore.kernel.org/r/20250523170208.530818-1-maz@kernel.org Signed-off-by: Marc Zyngier --- diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index cd853801a8f7..f1bb0d10c39a 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -12,6 +12,7 @@ #include #include #include +#include #include