Skip to content

Commit 289d0a4

Browse files
masahir0ybp3tk0v
authored andcommitted
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
1 parent ac9275b commit 289d0a4

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

arch/x86/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,7 @@ install:
296296

297297
vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg
298298
vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg
299-
vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg
300-
vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg
299+
vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg
301300

302301
archprepare: checkbin
303302
checkbin:

arch/x86/entry/vdso/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o := n
3535
# vDSO images to build
3636
obj-$(CONFIG_X86_64) += vdso-image-64.o
3737
obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o
38-
obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o
39-
obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o
38+
obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o
4039

4140
OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n
4241

0 commit comments

Comments
 (0)