From nobody Mon Jun 8 08:30:46 2026 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 CB371492526; Thu, 4 Jun 2026 16:24:55 +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=1780590297; cv=none; b=TVBkNumrcCuyYamEdSawRK+KL5uEjUxY/u0YL5tP6tYEcKJ+WEf/iA+6O9kJd54cIHbS7A1FtjaVdsL7q49KkVRx5gFNmgGAfgv7S0fjqaBslBJMO7ynEOj5M25kBio8gLwfJR46rdZQg1RGwB8VvjKKE7i8z+CICfx7P8OU8PM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780590297; c=relaxed/simple; bh=YSXTQcVL+3ZKjXaJIsuhgxkozl6JqVd6MpRBMRcIvNM=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=OLdKus7nrga4X+aF12/ph7qw9o5SdCjF3aFVLYVqtBRG7C/fIP1RsQps3/RpLM5JJJQK4/zjDc8hu5yF4VQiZ9UqtEmd3dgEDFJ1JqGvDSuNGm/BGkIkQQ3E6ZDIvxPj3rj/wtbxnDqokNd3ArrPr/3dUxDrt4vQJWJ1r6TFXlo= 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=dbpTa+0i; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=QaNrm+h4; 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="dbpTa+0i"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QaNrm+h4" Date: Thu, 04 Jun 2026 16:24:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780590294; 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=hNc1yOwm9Ov8sE4Iw5ex9Hq3qSkhkwbagf4femMV7GE=; b=dbpTa+0iDAoDLX73V/1DKzQv42EmYJD2JmYpBeDr7G+k3i/wADvH/WNXKG0SKDo5lK7aTc 2oHMJNpx/2v52VycHgpTVSRaytNAfiapKiDPn/7f3wNat27odw4hC8niHcpDG8VolhO7wL /UxX+PKPuYGruyB69jhZGdH5bZz63Fsqdxbt0GcnoyXf0Y+jze1WYmUxjtPZPK6dwzSCay TAXFpj8Ax/yhsX7pCviCDDboz828ezsTLqG7oQpGznd7KSvvHmXDF6/QnPPDMgR8bE3EGw BfLa7c1+Rpg4qWqyleeB7bwdBaXruGWlF5PQG+0j2nH+PoIWFbyra271F6Znsw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780590294; 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=hNc1yOwm9Ov8sE4Iw5ex9Hq3qSkhkwbagf4femMV7GE=; b=QaNrm+h4VIGBwZgG1moi3zmPRG2fI4tKkmZBndIgsznllQH7XFFFkcNiMTCHOxaOgslp89 /MEYm255FP11k4AQ== 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: <178059029309.710.5965112770766931520.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: 0ebac10c9f1020963dd803f871a9b413979c76b8 Gitweb: https://git.kernel.org/tip/0ebac10c9f1020963dd803f871a9b4139= 79c76b8 Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 21 May 2026 08:53:19 +02:00 Committer: Thomas Gleixner 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=C3=9Fschuh Signed-off-by: Thomas Gleixner Cc: Thomas Bogendoerfer Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f= @linutronix.de --- 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 =3D VDSO_CLOCKMODE_R4K; =20 clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);