The following commit has been merged into the x86/vdso branch of tip: Commit-ID: ac9275b3b4dd11a1c825071b9dbaf7614a399c89 Gitweb: https://git.kernel.org/tip/ac9275b3b4dd11a1c825071b9dbaf7614a399c89 Author: Masahiro Yamada <masahiroy@xxxxxxxxxx> AuthorDate: Wed, 22 Nov 2023 08:57:00 +09:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Thu, 08 Feb 2024 13:23:01 +01:00 x86/vdso: Use $(addprefix ) instead of $(foreach ) $(addprefix ) is slightly shorter and more intuitive. Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Link: https://lore.kernel.org/r/20231121235701.239606-4-masahiroy@xxxxxxxxxx --- arch/x86/entry/vdso/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index cbfb5aa..439b527 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -40,8 +40,8 @@ obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n -vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) -vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F) +vobjs := $(addprefix $(obj)/, $(vobjs-y)) +vobjs32 := $(addprefix $(obj)/, $(vobjs32-y)) $(obj)/vdso.o: $(obj)/vdso.so @@ -112,7 +112,7 @@ VDSO_LDFLAGS_vdsox32.lds = -m elf32_x86_64 -soname linux-vdso.so.1 \ vobjx32s-y := $(vobjs-y:.o=-x32.o) # same thing, but in the output directory -vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F) +vobjx32s := $(addprefix $(obj)/, $(vobjx32s-y)) # Convert 64bit object file to x32 for x32 vDSO. quiet_cmd_x32 = X32 $@