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] clocksource/drivers/timer-riscv: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
Date: Mon, 10 Aug 2026 14:26:55 -0000 [thread overview]
Message-ID: <178637201546.442315.3164153552013487963.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260724-vdso-arch-clockmodes-v4-6-ddbe447be860@linutronix.de>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: f9217a8cc4f19510a7f2176b92546a7438a279ac
Gitweb: https://git.kernel.org/tip/f9217a8cc4f19510a7f2176b92546a7438a279ac
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Fri, 24 Jul 2026 15:36:23 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Mon, 10 Aug 2026 16:25:21 +02:00
clocksource/drivers/timer-riscv: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
Now that there is a definition of VDSO_CLOCKMODE_ARCHTIMER
even if no vDSO is built, the ugly ifdeffery can be removed.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260724-vdso-arch-clockmodes-v4-6-ddbe447be860@linutronix.de
---
drivers/clocksource/timer-riscv.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c
index cfc4d83..b310e67 100644
--- a/drivers/clocksource/timer-riscv.c
+++ b/drivers/clocksource/timer-riscv.c
@@ -98,11 +98,7 @@ static struct clocksource riscv_clocksource = {
.mask = CLOCKSOURCE_MASK(64),
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.read = riscv_clocksource_rdtime,
-#if IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY)
.vdso_clock_mode = VDSO_CLOCKMODE_ARCHTIMER,
-#else
- .vdso_clock_mode = VDSO_CLOCKMODE_NONE,
-#endif
};
static int riscv_timer_starting_cpu(unsigned int cpu)
next prev parent reply other threads:[~2026-08-10 14:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-24 13:36 [PATCH v4 0/7] vDSO: " Thomas Weißschuh
2026-07-24 13:36 ` [PATCH v4 1/7] kbuild: support generated asm-headers in subdirectories Thomas Weißschuh
2026-08-01 19:30 ` Nicolas Schier
2026-08-10 14:27 ` [tip: timers/vdso] kbuild: Support " tip-bot2 for Thomas Weißschuh
2026-07-24 13:36 ` [PATCH v4 2/7] vDSO: Make clockmode constants available without CONFIG_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-07-24 15:31 ` Arnd Bergmann
2026-08-10 14:27 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-07-24 13:36 ` [PATCH v4 3/7] MIPS: csrc-r4k: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery Thomas Weißschuh
2026-08-10 14:26 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-07-24 13:36 ` [PATCH v4 4/7] clocksource/drivers/mips-gic-timer: " Thomas Weißschuh
2026-08-10 14:26 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-08-12 8:32 ` [PATCH v4 4/7] " Daniel Lezcano
2026-07-24 13:36 ` [PATCH v4 5/7] clocksource/drivers/arm_arch_timer: " Thomas Weißschuh
2026-08-10 14:26 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-08-12 8:32 ` [PATCH v4 5/7] " Daniel Lezcano
2026-07-24 13:36 ` [PATCH v4 6/7] clocksource/drivers/timer-riscv: " Thomas Weißschuh
2026-08-10 14:26 ` tip-bot2 for Thomas Weißschuh [this message]
2026-08-12 8:33 ` Daniel Lezcano
2026-07-24 13:36 ` [PATCH v4 7/7] LoongArch: " Thomas Weißschuh
2026-08-10 14:26 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-07-24 15:35 ` [PATCH v4 0/7] vDSO: " Arnd Bergmann
2026-08-13 10:26 ` Vincenzo Frascino
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=178637201546.442315.3164153552013487963.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®