From nobody Mon Jun 8 03:20:27 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 C15A9403EAC; Thu, 4 Jun 2026 09:08:00 +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=1780564082; cv=none; b=ffdgDRPA55yfVPfwe86ahzb+b4p6aBY7XtIgfc0mZwOtTvJP9f5cxW37+ucPktvZHGPK0TalH6HBKq31fKAcO8ZPLQKf8O+bA4TUhErOcFH7CGxhQTZ6/GIAu9p2FIGT5QOMJcw+zmGcbKv20PIjoy/FbePnVawYmgEsC4IjUAA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780564082; c=relaxed/simple; bh=WG68er7mWhtXzoMGquvzrIuPtJcqtK27VIli13GUAtg=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=fKJggIWIvi7Mu/90DsxQ15v5i423iMyvJo9tLTLWaaPez8CQjdUMzcJo+py2NqIpwZLGk07HxKGYSA98X5N9NMvxYAbq/scTGm6oqLUpV30DLk6+MUBQtYqG18gNF/Y2CTFQjZS5Te3VY4ZGLSkRLSahUNfgAd1/SdA6QiRi2YY= 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=pYILrURr; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=sF6ejuCk; 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="pYILrURr"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="sF6ejuCk" Date: Thu, 04 Jun 2026 09:07:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780564079; 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=vkcb1Rd+ct8UmH2PLoiUue3UJfCM3mEmffOZezVQ/R4=; b=pYILrURrDj3ZkbiaJtm17qkPkozNfYTYW2fGeY+s/oXpcuk/hX/dTGzLBXNkNeYgWS7OjM 7BfLKvm4Z3gqlK2gGOJZDg8pE6R1KXnoO9sisB1LWJvDP9Pdo+a7NMWf5Bm9B6gTpQev8l J7R250ds142BLG0kJk9iPpHwmyibkXI9ekFD2qHO7R+NqL+nyXyb9M0mNc2l9+b3nrYnbL 19AcPuXDgEIVeHhcDMYC+oL+brp8/ytPXMJETBpbIwLfV9hwXlBr+Eh6SEn2vx6CYKZc4h hCTrXj0zVshyCzW7PLt7kbvwhwKBeIklIAD77rKu+aBaNVlKBip5xhJDK7zs7g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780564079; 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=vkcb1Rd+ct8UmH2PLoiUue3UJfCM3mEmffOZezVQ/R4=; b=sF6ejuCkmmD61YnvR7ZYRwwyQC0tV10b1MMov6bmOPHcDCqrT2xXdgsrCJYWWqgaOCHtHF rElYwkHBlLxFzXAQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/ptp] timekeeping: Remove system_time_snapshot::real/boot/raw Cc: Thomas Gleixner , David Woodhouse , Arthur Kiyanovski , thomas.weissschuh@linutronix.de, Jacob Keller , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260529195557.330029635@kernel.org> References: <20260529195557.330029635@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178056407797.710.12890805267800537063.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/ptp branch of tip: Commit-ID: 705e1068071f82b6c66b9e28124fbb7123b04c1d Gitweb: https://git.kernel.org/tip/705e1068071f82b6c66b9e28124fbb712= 3b04c1d Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:20 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 04 Jun 2026 11:04:16 +02:00 timekeeping: Remove system_time_snapshot::real/boot/raw All users are converted over to ktime_get_snapshot_id() and system_time_snapshot::systime and ::monoraw. Remove the leftovers. Signed-off-by: Thomas Gleixner Tested-by: David Woodhouse Tested-by: Arthur Kiyanovski Reviewed-by: David Woodhouse Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20260529195557.330029635@kernel.org --- include/linux/timekeeping.h | 10 +--------- kernel/time/timekeeping.c | 8 -------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 161157c..eb64c90 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -280,9 +280,6 @@ static inline bool ktime_get_aux_ts64(clockid_t id, str= uct timespec64 *kt) { ret * a selected CLOCK_* and the clocksource counter value * @cycles: Clocksource counter value to produce the system times * @systime: The system time of the selected CLOCK ID - * @real: Realtime system time - * @boot: Boot time - * @raw: Monotonic raw system time * @monoraw: Monotonic raw system time * @cs_id: Clocksource ID * @clock_was_set_seq: The sequence number of clock-was-set events @@ -292,12 +289,7 @@ static inline bool ktime_get_aux_ts64(clockid_t id, st= ruct timespec64 *kt) { ret struct system_time_snapshot { u64 cycles; ktime_t systime; - ktime_t real; - ktime_t boot; - union { - ktime_t raw; - ktime_t monoraw; - }; + ktime_t monoraw; enum clocksource_ids cs_id; unsigned int clock_was_set_seq; u8 cs_was_changed_seq; diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index ccd04ad..a134b1b 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1196,8 +1196,6 @@ void ktime_get_snapshot_id(clockid_t clock_id, struct= system_time_snapshot *syst struct timekeeper *tk; struct tk_data *tkd; unsigned int seq; - ktime_t base_real; - ktime_t base_boot; =20 /* Invalidate the snapshot for all failure cases */ systime_snapshot->valid =3D false; @@ -1239,18 +1237,12 @@ void ktime_get_snapshot_id(clockid_t clock_id, stru= ct system_time_snapshot *syst offs_sys =3D *offs; base_raw =3D tk->tkr_raw.base; =20 - /* Kept around until the callers are fixed up */ - base_real =3D ktime_add(base_sys, tk_core.timekeeper.offs_real); - base_boot =3D ktime_add(base_sys, tk_core.timekeeper.offs_boot); - nsec_sys =3D timekeeping_cycles_to_ns(&tk->tkr_mono, now); nsec_raw =3D timekeeping_cycles_to_ns(&tk->tkr_raw, now); } while (read_seqcount_retry(&tkd->seq, seq)); =20 systime_snapshot->cycles =3D now; systime_snapshot->systime =3D ktime_add_ns(base_sys, offs_sys + nsec_sys); - systime_snapshot->real =3D ktime_add_ns(base_real, nsec_sys); - systime_snapshot->boot =3D ktime_add_ns(base_boot, nsec_sys); systime_snapshot->monoraw =3D ktime_add_ns(base_raw, nsec_raw); =20 /*