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@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231121235701.239606-5-masahiroy@kernel.org

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 2264db14a25d3b034ffa93685d6353564d4a9225..f2260acfd6397e099b10778a13782e3c492b2357 100644 (file)
--- 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 439b52772e6912579022ebed167de945770791ad..7a97b17f28b7c503c37c0f6897257bf10942ce82 100644 (file)
--- 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