From nobody Tue Sep 29 08:26:18 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 2E25D3FC5A6; Mon, 10 Aug 2026 14:27:09 +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=1786372034; cv=none; b=RKFH+9qXDdecqlLgjLuEKihA5wyt4LZ+WONpZ/36nBoq0d//6oLpUhZtKlsqozGyOOklfmWJsxwnLltKFNymXBwxxGA8Kh8X5En6dshWcxdCbQQdzShuFstQMkAu76LaMOmQuxzuk9dIFTE6cgch0p3XLzWS/UUdxaFvU0o1Xig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786372034; c=relaxed/simple; bh=/lFM8yFPzN1h6LyF6DbbT9j1yvqwlNWRCGT+O6h6s9Y=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=rb5sbikHmYJYwnlIda0gyC3L7be5H5QyR2SZ5r/9L1tcjC6q0VS+WLK0pmCYYjhRypoiZcwDcdOLviB4S5j0zodnOtFdq+di1b17/RShjhSIG5UhGG1eBUYimZ3lPEwVdQUlIlYd5UlRu5vtSJfgqLSIJLOeRSt/i8kXfeyzkg8= 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=mUQw9ouW; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TdNlQapi; 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="mUQw9ouW"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TdNlQapi" Date: Mon, 10 Aug 2026 14:26:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1786372021; 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=eg8xtSW2HfCD9OzCrUWCwpLgb3ahuVFDD50L0ODQWzQ=; b=mUQw9ouWkdolwH2MPdsuA75z4+ra1KGbm/ax9iLpnp9+o5/WIBR9JhVu9Cae81SieH7MFb YT3FNCl4NqAt0SydKlpa4CpgwWmw6Yj7ieIRtBZd1GLEVNLUWhDEpJImOWIYJKOQlr9dS4 4KROuiesnb+tkYAtfZR/u6qspp/VjNfEI3dHkQc55wkQOzX/8mWXOTSL79hQ4hUnLrc1Dj CJ3MVZkwgpw1jOyy/U4yoHlj4tHze8KGAjlmc69kWHV9Z4cAWCV9FefeNtPYt4BUEiFX5C 0GRVhTK2+VLrbbVCTxjp+MHyt2/SCMeU5K5UJvsBuC5gARXLW5wOHMxKM6O5hw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1786372021; 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=eg8xtSW2HfCD9OzCrUWCwpLgb3ahuVFDD50L0ODQWzQ=; b=TdNlQapiQWo3WaFE+MyEs3lXGgfwis8EWjcJYl+0jsOvGFBkmmsyNUrRO2ViN16U4BP+l4 OCL1vvzPKooSwMCA== 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: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260724-vdso-arch-clockmodes-v4-3-ddbe447be860@linutronix.de> References: <20260724-vdso-arch-clockmodes-v4-3-ddbe447be860@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178637201994.442315.2923181057013288373.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: b86aefb11c6dd60c192b222a0a601115196b72a5 Gitweb: https://git.kernel.org/tip/b86aefb11c6dd60c192b222a0a6011151= 96b72a5 Author: Thomas Wei=C3=9Fschuh AuthorDate: Fri, 24 Jul 2026 15:36:20 +02:00 Committer: Thomas Gleixner CommitterDate: Mon, 10 Aug 2026 16:25:21 +02:00 MIPS: csrc-r4k: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery Now that there is a definition of VDSO_CLOCKMODE_R4K even if no vDSO is built, the ugly ifdeffery can be removed. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260724-vdso-arch-clockmodes-v4-3-ddbe447be= 860@linutronix.de --- arch/mips/kernel/csrc-r4k.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 241a934..59eca39 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -126,14 +126,12 @@ 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