[tip: x86/vdso] x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32
From: tip-bot2 for Masahiro Yamada
Date: Thu Feb 08 2024 - 08:05:36 EST
The following commit has been merged into the x86/vdso branch of tip:
Commit-ID: 289d0a475c3e5be42315376d08e0457350fb8e9c
Gitweb: https://git.kernel.org/tip/289d0a475c3e5be42315376d08e0457350fb8e9c
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
AuthorDate: Wed, 22 Nov 2023 08:57:01 +09:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Thu, 08 Feb 2024 13:23:14 +01:00
x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32
In arch/x86/Kconfig, COMPAT_32 is defined as (IA32_EMULATION || X86_32).
Use it to eliminate redundancy in Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Link: https://lore.kernel.org/r/20231121235701.239606-5-masahiroy@xxxxxxxxxx
---
arch/x86/Makefile | 3 +--
arch/x86/entry/vdso/Makefile | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 2264db1..f2260ac 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -296,8 +296,7 @@ install:
vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg
vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg
-vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg
-vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg
+vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg
archprepare: checkbin
checkbin:
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 439b527..7a97b17 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o := n
# vDSO images to build
obj-$(CONFIG_X86_64) += vdso-image-64.o
obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o
-obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o
-obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o
+obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o
OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n