Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88f2865d authored by Frank van der Linden's avatar Frank van der Linden Committed by Lee Jones
Browse files

UPSTREAM: 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.

Bug: 254441685
Fixes: 8d75785a8142 ("ARM64: vdso32: Install vdso32 from vdso_install")
Signed-off-by: default avatarFrank 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: default avatarCatalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 5d28ba5f8a0cfa3a874fa96c33731b8fcd141b3a)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: Id2cc0850326d78f437130dcb4fd6f75a6bb336ed
parent e045967b

arch/arm64/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ dtbs_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: