mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32

Browse source 
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
This commit is contained in:
Masahiro Yamada 2023-11-22 08:57:01 +09:00 committed by Borislav Petkov (AMD)
parent ac9275b3b4
commit 289d0a475c
2 changed files with 2 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/Makefile
View file

@ -296,8 +296,7 @@ install:
vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg 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_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg
vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg
vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg
archprepare: checkbin archprepare: checkbin
checkbin: checkbin:

3
arch/x86/entry/vdso/Makefile
View file

@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o := n
# vDSO images to build # vDSO images to build
obj-$(CONFIG_X86_64) += vdso-image-64.o obj-$(CONFIG_X86_64) += vdso-image-64.o
obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o
obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o
obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o
OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n