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@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] vdso/gettimeofday: Define fallback __arch_get_vdso_u_time_data() in gettimeofday.c
Date: Thu, 15 Oct 2026 15:37:53 -0000 [thread overview]
Message-ID: <179207867360.2666988.9506178193356079066.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260909-vdso-asm-generic-vsyscall-h-v1-2-63ae856cc659@linutronix.de>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 4fba7bb3e73a8087c353a6679a49ad81579114bc
Gitweb: https://git.kernel.org/tip/4fba7bb3e73a8087c353a6679a49ad81579114bc
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Wed, 09 Sep 2026 10:51:15 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 15 Oct 2026 17:33:19 +02:00
vdso/gettimeofday: Define fallback __arch_get_vdso_u_time_data() in gettimeofday.c
__arch_get_vdso_u_time_data() is only used in gettimeofday.c. vsyscall.h
has become a dumping ground for different kinds of fallbacks.
Move the fallback function definition into gettimeofday.c,
similar to other fallbacks.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260909-vdso-asm-generic-vsyscall-h-v1-2-63ae856cc659@linutronix.de
---
include/asm-generic/vdso/vsyscall.h | 7 -------
lib/vdso/gettimeofday.c | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h
index a6b03cf..fe12fb1 100644
--- a/include/asm-generic/vdso/vsyscall.h
+++ b/include/asm-generic/vdso/vsyscall.h
@@ -4,13 +4,6 @@
#ifndef __ASSEMBLER__
-#ifndef __arch_get_vdso_u_time_data
-static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)
-{
- return &vdso_u_time_data;
-}
-#endif
-
#ifndef __arch_get_vdso_u_rng_data
static __always_inline const struct vdso_rng_data *__arch_get_vdso_u_rng_data(void)
{
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index f7a591a..b867c23 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -93,6 +93,13 @@ static inline bool vdso_cycles_ok(u64 cycles)
}
#endif
+#ifndef __arch_get_vdso_u_time_data
+static __always_inline const struct vdso_time_data *__arch_get_vdso_u_time_data(void)
+{
+ return &vdso_u_time_data;
+}
+#endif
+
static __always_inline bool vdso_clockid_valid(clockid_t clock)
{
/* Check for negative values or invalid clocks */
next prev parent reply other threads:[~2026-10-15 15:38 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-09 8:51 [PATCH 00/15] vdso: Clean up the vsyscall.h headers Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 01/15] vdso: Move the kernel-side time update helpers to a new header Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 02/15] vdso/gettimeofday: Define fallback __arch_get_vdso_u_time_data() in gettimeofday.c Thomas Weißschuh
2026-10-15 15:37 ` tip-bot2 for Thomas Weißschuh [this message]
2026-09-09 8:51 ` [PATCH 03/15] vdso/getrandom: Define fallback __arch_get_vdso_u_rng_data() in getrandom.c Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 04/15] vdso/vsyscall: Define fallback time synchronization functions in vsyscall.c Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 05/15] vdso: Delete asm-generic/vdso/vsyscall.h Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 06/15] x86/vdso: Move vDSO page definitions to asm/vdso.h Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 07/15] sparc/vdso: Move __VDSO_PAGES " Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 08/15] s390/vdso: Delete asm/vdso/vsyscall.h inclusions Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 09/15] sparc/vdso: Delete asm/vdso/vsyscall.h inclusion Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 10/15] x86/vdso: Delete asm/vdso/vsyscall.h inclusions Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 11/15] arm64/vdso: " Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 12/15] riscv/hwprobe: Include vdso/datapage.h Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 13/15] vdso: Remove unnecessary vdso/vsyscall.h includes Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 14/15] vdso: Add asm-generic/vdso/vsyscall.h Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-09-09 8:51 ` [PATCH 15/15] vdso: Remove __ASSEMBLER__ guards from vsyscall.h Thomas Weißschuh
2026-10-15 15:37 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-11-01 22:15 ` [PATCH 00/15] vdso: Clean up the vsyscall.h headers 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=179207867360.2666988.9506178193356079066.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@kernel.org \
--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®