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@kernel.org>,
	Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available
Date: Thu, 04 Jun 2026 16:24:51 -0000	[thread overview]
Message-ID: <178059029177.710.7444978176819097992.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de>

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

Commit-ID:     a7d9141d5ddf08fa3cd50a079be4bd93a8aa42fe
Gitweb:        https://git.kernel.org/tip/a7d9141d5ddf08fa3cd50a079be4bd93a8aa42fe
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Thu, 21 May 2026 08:53:20 +02:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Thu, 04 Jun 2026 18:22:46 +02:00

clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available

VDSO_CLOCKMODE_GIC is only defined if CONFIG_GENERIC_GETTIMEOFDAY is
enabled. Right now this is always the case, but it will change soon.

Prepare for the potential unavailability of VDSO_CLOCKMODE_GIC.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de
---
 drivers/clocksource/mips-gic-timer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 1501c7d..a166926 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -198,7 +198,9 @@ static struct clocksource gic_clocksource = {
 	.name			= "GIC",
 	.read			= gic_hpt_read,
 	.flags			= CLOCK_SOURCE_IS_CONTINUOUS,
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
 	.vdso_clock_mode	= VDSO_CLOCKMODE_GIC,
+#endif
 };
 
 static void gic_clocksource_unstable(char *reason)

  reply	other threads:[~2026-06-04 16:24 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-21  6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 2/9] vdso/datastore: Always provide symbol declarations Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-05  7:59     ` Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
2026-06-04 16:24   ` tip-bot2 for Thomas Weißschuh [this message]
2026-06-09 15:04   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:03   ` tip-bot2 for Thomas Weißschuh

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=178059029177.710.7444978176819097992.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=tsbogend@alpha.franken.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®