2020-08-27 23:41:34

by Frank van der Linden

Subject: [PATCH] arm64: vdso32: make vdso32 install conditional

vdso32 should only be installed if CONFIG_COMPAT_VDSO is enabled,
since it's not even supposed to be compiled otherwise, and arm64
builds without a 32bit crosscompiler will fail.

Signed-off-by: Frank van der Linden <[email protected]>
Fixes: 8d75785a8142 ("ARM64: vdso32: Install vdso32 from vdso_install")
Cc: [email protected] [5.4+]
---
arch/arm64/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index b45f0124cc16..100abbb19e0b 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -165,7 +165,8 @@ zinstall install:
PHONY += vdso_install
vdso_install:
$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
- $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@
+ $(if $(CONFIG_COMPAT_VDSO),$(Q)$(MAKE) \
+ $(build)=arch/arm64/kernel/vdso32 $@)

# We use MRPROPER_FILES and CLEAN_FILES now
archclean:
--
2.16.6

2020-08-28 12:34:34

by Catalin Marinas

Subject: Re: [PATCH] arm64: vdso32: make vdso32 install conditional

On Thu, 27 Aug 2020 23:40:12 +0000, Frank van der Linden wrote:
> vdso32 should only be installed if CONFIG_COMPAT_VDSO is enabled,
> since it's not even supposed to be compiled otherwise, and arm64
> builds without a 32bit crosscompiler will fail.

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: vdso32: make vdso32 install conditional
https://git.kernel.org/arm64/c/5d28ba5f8a0c

--
Catalin