From: "tip-bot2 for Masahiro Yamada" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/vdso] x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32
Date: Thu, 08 Feb 2024 13:04:39 -0000 [thread overview]
Message-ID: <170739747901.398.12579593288355831715.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231121235701.239606-5-masahiroy@kernel.org>
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@kernel.org>
AuthorDate: Wed, 22 Nov 2023 08:57:01 +09:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
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@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231121235701.239606-5-masahiroy@kernel.org
---
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
next prev parent reply other threads:[~2024-02-08 13:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 23:56 [PATCH 0/4] x86: vdso: clean up vdso Makefile Masahiro Yamada
2023-11-21 23:56 ` [PATCH 1/4] x86: vdso: consolidate targets and clean-files Masahiro Yamada
2024-02-08 13:04 ` [tip: x86/vdso] x86/vdso: Consolidate " tip-bot2 for Masahiro Yamada
2023-11-21 23:56 ` [PATCH 2/4] x86: vdso: simplify obj-y addition Masahiro Yamada
2024-02-08 13:04 ` [tip: x86/vdso] x86/vdso: Simplify " tip-bot2 for Masahiro Yamada
2023-11-21 23:57 ` [PATCH 3/4] x86: vdso: use $(addprefix ) instead of $(foreach ) Masahiro Yamada
2024-02-08 13:04 ` [tip: x86/vdso] x86/vdso: Use " tip-bot2 for Masahiro Yamada
2023-11-21 23:57 ` [PATCH 4/4] x86: vdso: use CONFIG_COMPAT_32 to specify vdso32 Masahiro Yamada
2024-02-08 13:04 ` tip-bot2 for Masahiro Yamada [this message]
2024-02-02 15:56 ` [PATCH 0/4] x86: vdso: clean up vdso Makefile Masahiro Yamada
2024-02-07 8:24 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=170739747901.398.12579593288355831715.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®