summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank van der Linden <fllinden@amazon.com>2020-08-27 23:40:12 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2020-08-28 13:18:48 +0100
commit5d28ba5f8a0cfa3a874fa96c33731b8fcd141b3a (patch)
tree59d18768999e1fce1f9cbfe91dd9e1f8442ce2cf
parent1764c3edc66880778604f5053fe2dda7b3ddd2c1 (diff)
downloadlinux-sh-5d28ba5f8a0cfa3a874fa96c33731b8fcd141b3a.tar.gz
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. Fixes: 8d75785a8142 ("ARM64: vdso32: Install vdso32 from vdso_install") Signed-off-by: Frank van der Linden <fllinden@amazon.com> Cc: stable@vger.kernel.org [5.4+] Link: https://lore.kernel.org/r/20200827234012.19757-1-fllinden@amazon.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 20ab5c9375a5..130569f90c54 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -170,7 +170,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: