Commit 289d0a47 authored Nov 22, 2023 by Masahiro Yamada Committed by Borislav Petkov (AMD) Feb 08, 2024

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

parent ac9275b3

arch/x86/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -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:

arch/x86/entry/vdso/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -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