mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: thomas.weissschuh@linutronix.de,
	Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] time: Build generic update_vsyscall() only with generic time vDSO
Date: Thu, 04 Sep 2025 09:32:20 -0000	[thread overview]
Message-ID: <175697834069.1920.2638083638720281912.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250826-vdso-cleanups-v1-5-d9b65750e49f@linutronix.de>

The following commit has been merged into the timers/vdso branch of tip:

Commit-ID:     ea1a1fa919a5b4f39fa46073e7b3a19b12521f05
Gitweb:        https://git.kernel.org/tip/ea1a1fa919a5b4f39fa46073e7b3a19b12521f05
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Tue, 26 Aug 2025 08:17:08 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 04 Sep 2025 11:23:50 +02:00

time: Build generic update_vsyscall() only with generic time vDSO

The generic vDSO can be used without the time-related functionality.
In that case the generic update_vsyscall() from kernel/time/vsyscall.c
should not be built.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250826-vdso-cleanups-v1-5-d9b65750e49f@linutronix.de

---
 kernel/time/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index e6e9b85..f7d52d9 100644
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_LEGACY_TIMER_TICK)			+= tick-legacy.o
 ifeq ($(CONFIG_SMP),y)
  obj-$(CONFIG_NO_HZ_COMMON)			+= timer_migration.o
 endif
-obj-$(CONFIG_HAVE_GENERIC_VDSO)			+= vsyscall.o
+obj-$(CONFIG_GENERIC_GETTIMEOFDAY)		+= vsyscall.o
 obj-$(CONFIG_DEBUG_FS)				+= timekeeping_debug.o
 obj-$(CONFIG_TEST_UDELAY)			+= test_udelay.o
 obj-$(CONFIG_TIME_NS)				+= namespace.o

  reply	other threads:[~2025-09-04  9:32 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-26  6:17 [PATCH 00/11] vdso: Various cleanups Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 01/11] vdso/datastore: Gate time data behind CONFIG_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2025-09-04  9:32   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 02/11] ARM: VDSO: remove cntvct_ok global variable Thomas Weißschuh
2025-09-04  9:32   ` [tip: timers/vdso] ARM: VDSO: Remove " tip-bot2 for Rasmus Villemoes
2025-08-26  6:17 ` [PATCH 03/11] vdso: Move ENABLE_COMPAT_VDSO from core to arm64 Thomas Weißschuh
2025-08-26 19:33   ` Catalin Marinas
2025-09-04  9:32   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 04/11] vdso/gettimeofday: Remove !CONFIG_TIME_NS stubs Thomas Weißschuh
2025-09-04  9:32   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 05/11] time: Build generic update_vsyscall() only with generic time vDSO Thomas Weißschuh
2025-09-04  9:32   ` tip-bot2 for Thomas Weißschuh [this message]
2025-08-26  6:17 ` [PATCH 06/11] riscv: vdso: Untangle kconfig logic Thomas Weißschuh
2025-09-04  9:32   ` [tip: timers/vdso] riscv: vdso: Untangle Kconfig logic tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 07/11] vdso: Drop kconfig GENERIC_VDSO_32 Thomas Weißschuh
2025-09-04  9:32   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 08/11] vdso: Drop kconfig GENERIC_COMPAT_VDSO Thomas Weißschuh
2025-08-26 19:33   ` Catalin Marinas
2025-09-04  9:32   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 09/11] vdso: Drop kconfig GENERIC_VDSO_DATA_STORE Thomas Weißschuh
2025-08-26 19:33   ` Catalin Marinas
2025-09-04  9:32   ` [tip: timers/vdso] vdso: Drop Kconfig GENERIC_VDSO_DATA_STORE tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 10/11] vdso: Drop kconfig GENERIC_VDSO_TIME_NS Thomas Weißschuh
2025-08-26 19:34   ` Catalin Marinas
2025-09-04  9:32   ` [tip: timers/vdso] vdso: Drop Kconfig GENERIC_VDSO_TIME_NS tip-bot2 for Thomas Weißschuh
2025-08-26  6:17 ` [PATCH 11/11] vdso: Gate VDSO_GETRANDOM behind HAVE_GENERIC_VDSO Thomas Weißschuh
2025-09-04  9:32   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-10-09  1:06 ` [PATCH 00/11] vdso: Various cleanups patchwork-bot+linux-riscv

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=175697834069.1920.2638083638720281912.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=thomas.weissschuh@linutronix.de \
    --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®