[tip: timers/vdso] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available

From: tip-bot2 for Thomas Weißschuh

Date: Thu Jun 04 2026 - 12:56:16 EST


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

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

MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available

VDSO_CLOCKMODE_R4K 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_R4K.

[ tglx: Replace #ifdeffery ]

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxx>
Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@xxxxxxxxxxxxx
---
arch/mips/kernel/csrc-r4k.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index 59eca39..5ce95e1 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -130,7 +130,8 @@ int __init init_r4k_clocksource(void)
* R2 onwards makes the count accessible to user mode so it can be used
* by the VDSO (HWREna is configured by configure_hwrena()).
*/
- if (cpu_has_mips_r2_r6 && rdhwr_count_usable())
+ if (IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY) &&
+ cpu_has_mips_r2_r6 && rdhwr_count_usable())
clocksource_mips.vdso_clock_mode = VDSO_CLOCKMODE_R4K;

clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);