From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11B4C48AE06; Tue, 9 Jun 2026 15:04:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781017450; cv=none; b=GP8qPsm1hZKj6CqT7EhwZ6rMdIRs8Dr7p9T5L70rYUZwex8GPfxxq1nZUattBh6+wWxZYoY0KGEprY3j8aQXVaq9dumqjasf+JB5yhBOurzOw5gpWPdahlzNKB1rwlxJ6aDhB8ybGunV/1UWLmg6b256ht4y8F7AMFN6H8Yq2wo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781017450; c=relaxed/simple; bh=H5Fv3BfpFC5tqapYJpYyRjbdSG2vq+folsmX9/EeJNs=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=D4ME3nJnQ2jnE3yNmxRCPnmNT8PoVqob6ju6s2vr8QnesoICZ/BO1JLgMnAwR/uO/kfWVsFzM8fFo3pi7Z78CLNmTseNh8WXxWVqermfPyEMjWT11y5QeYfGAH3oOOaUjsLIXE1WWo5PwGVKJ2/deUiBkJ3J9Q9BpTlAwu7de/U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Tq6XHvRk; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Fyqz4Uqc; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Tq6XHvRk"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Fyqz4Uqc" Date: Tue, 09 Jun 2026 15:04:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1781017446; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F8dy2cyKEWyCJGA3MxnEiaQei+ZlR+2rhddqiSuiCz4=; b=Tq6XHvRkm7YiiUuR90MY7+LUiIlPY3aqXKafgoCv0vvXC95bqxKJW7QfL8UpXpvIjZGDuS dsafh8OI0LwMi+36w0P71glwUYESpOzrThVK6LUu3LEEO5PtGaBjiRc577nVCJXP3xZwPL 9+6PQtK9i8qDW5KtpPFh79kiEhQC02+3vkjUMBk9an31XQM4J0ry4gNDiZNSazY+MbE0dz YScVBvQdpWytntYaA3tJcSUUp0BfJD7zY/+wdQ0evnHPELjPq7XJrLYI88mqDJj7Hgl4Nl UJjMHGfUNYbRN9FdhffjS+TLmHCqKK917HSlpsBUJLSJSZGx97P4LX0rhuCyyw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1781017446; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F8dy2cyKEWyCJGA3MxnEiaQei+ZlR+2rhddqiSuiCz4=; b=Fyqz4UqcLaVqHrTJwxkywyfl2vJLIUaZNLsBKdZ+rPoL5XxO8CLoLsPFztbzRpBBqsgPxf BR/YjqZQofgX71BA== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/vdso] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Thomas Bogendoerfer , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178101744535.529383.9834035518796775885.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/vdso branch of tip: Commit-ID: f3dc8fb24f90fa2901a87fb5273edabcc4e8f2ed Gitweb: https://git.kernel.org/tip/f3dc8fb24f90fa2901a87fb5273edabcc4e= 8f2ed Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 21 May 2026 08:53:19 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 09 Jun 2026 17:02:10 +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. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Cc: Thomas Bogendoerfer Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@l= inutronix.de --- arch/mips/kernel/csrc-r4k.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 59eca39..241a934 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -126,12 +126,14 @@ int __init init_r4k_clocksource(void) clocksource_mips.rating =3D 200; clocksource_mips.rating +=3D clamp(mips_hpt_frequency / 10000000, 0, 99); =20 +#ifdef CONFIG_GENERIC_GETTIMEOFDAY /* * 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()) clocksource_mips.vdso_clock_mode =3D VDSO_CLOCKMODE_R4K; +#endif =20 clocksource_register_hz(&clocksource_mips, mips_hpt_frequency); =20