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 BCCB03E314A; Mon, 10 Aug 2026 14:26:59 +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=1786372024; cv=none; b=hlYUU7GrL6h1hyTYPsnKX6/t/909YaveOSTN9b764vtkftyjVCMArzcQEFxXa6l81GP46+2dJ0kB3JxHITT7Jfu4s50ojBNhu9NXRSrQid6OmvmtrR5q02/j4SZQd53h1rGBQ3VbFsSe1/Fxza1yYraLM9Sqs69LAm/juEvHIcs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786372024; c=relaxed/simple; bh=mROaqS3/m9nWTWzJKotjNUkixE/HKn+CYu51Y9et8jo=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=kkmothiBI1kcYlPSJ3c4hSHnuZdxybPcn1eVSe9o897O5MaCag9ddmzJkRUan9CkhqBDzlrv2CjOQs0TXVzir17LWQpEnJbySzJ3pvE1dJXIwCfTR7UHcBHT8RU1YrzhS8KfyUXcz/ST+hY8jt85NTvaBDHWGkThGZ+LGaMt16Q= 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=VWO//2Rm; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=WMgwiZjl; 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="VWO//2Rm"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="WMgwiZjl" Date: Mon, 10 Aug 2026 14:26:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1786372017; 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=2SudMDT+jaUatEuThYBnBwOawmnKM00veMu1lVAS1j4=; b=VWO//2RmSEJVWoCJh2S0Ko/IGijADO35bixb6/ss9cbx2xJb9Oi76dWNJMLyXX3sFk/ZvK QFscZILyPgBz2fXh4MaQYdh+3n9AkS6kbRHl8UrDW0syV4Q1bZYXU7b6pAxBeISkKnTTAJ JVP9DbA9tAtA3gORDkSCoSpv883cvD5INtUzLRS6lPQlSBOweiuznq637md3zjJ9yyk3DL llP/o1vIlDIyb+CLRGsIqvcWTzQMJC4tTAfdK4nxWyiI5lTPC2DKgKAhuSzqJu5L3hfEgR uJ9DpOgBnLDeIjUhAH3CO3JviFeKMMAVWFg7etIEipESqyYm1nBZqEJuZpcL1w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1786372017; 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=2SudMDT+jaUatEuThYBnBwOawmnKM00veMu1lVAS1j4=; b=WMgwiZjlWqSmYIkhwvwC8WU3vt5MhbN3rSCtOb2DT73hoU8dVYxRKOmC8SAdhwLMfyLQYs nly94/lXww0DPxBA== 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] clocksource/drivers/timer-riscv: 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-6-ddbe447be860@linutronix.de> References: <20260724-vdso-arch-clockmodes-v4-6-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: <178637201546.442315.3164153552013487963.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: f9217a8cc4f19510a7f2176b92546a7438a279ac Gitweb: https://git.kernel.org/tip/f9217a8cc4f19510a7f2176b92546a7438a= 279ac Author: Thomas Wei=C3=9Fschuh AuthorDate: Fri, 24 Jul 2026 15:36:23 +02:00 Committer: Thomas Gleixner CommitterDate: Mon, 10 Aug 2026 16:25:21 +02:00 clocksource/drivers/timer-riscv: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery Now that there is a definition of VDSO_CLOCKMODE_ARCHTIMER 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-6-ddbe447be86= 0@linutronix.de --- drivers/clocksource/timer-riscv.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-ri= scv.c index cfc4d83..b310e67 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c @@ -98,11 +98,7 @@ static struct clocksource riscv_clocksource =3D { .mask =3D CLOCKSOURCE_MASK(64), .flags =3D CLOCK_SOURCE_IS_CONTINUOUS, .read =3D riscv_clocksource_rdtime, -#if IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY) .vdso_clock_mode =3D VDSO_CLOCKMODE_ARCHTIMER, -#else - .vdso_clock_mode =3D VDSO_CLOCKMODE_NONE, -#endif }; =20 static int riscv_timer_starting_cpu(unsigned int cpu)