From nobody Wed Oct 8 17:31:13 2025 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 455F02BF01C; Wed, 25 Jun 2025 16:15:58 +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=1750868160; cv=none; b=MeSimbGFCop+NVS8a2pVcSW40n0VqUmy4Kq9pYLNCeSRHTUOjmDFU0raRHm6CiRTKiIdq8kd3VqQRYbLXuWMDMugDT8bRx61zd7BMuOSiYzXHzk6DsOYZOJNIWNCW1o3JIo0KWi/8UXCVwDwgGdNkE5+Z7dAECMPLrFpT+8D5x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750868160; c=relaxed/simple; bh=7uxwHEfbbUihzSLB+PaXNWkNiYSbKgbJxQOJSWeWIjc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=H3kYFJd0x/jq3ixYqlfLlDLN2bYE6IpfSuXFxMipZqPmEsvn8s3B3PXdlPtsYGR+eWVQXnLfWcW8VywxKTu7MXe6ysf64PoEtbP/7ODKNv9C6urx9fzUdsQ9eiFNpDYNyqtVpMVR4Q6sQd8K6NlqgIyy61Iik5IzAOQCZ/4cNVY= 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=L8VKAdOb; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ar41yW1n; 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="L8VKAdOb"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ar41yW1n" Date: Wed, 25 Jun 2025 16:15:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1750868157; 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=AY7YTo8FvaSdaGVXfsVnon1HJe/6EgNNVm+fL44JT3o=; b=L8VKAdObc3YDpZYf4ADzszinX39u/cKXjUvOXF1whx9MmuHBnGMURyxn8i61nXUXRNmPTE EA8J64B/2oKOmg4sFMV8asn9ezl9rUn9YAgfKOsYalwuZ54IGj0y02L1oFpuwxkRRrLS4L MyibIk8OnCqNrOW3K6OxjlDvxkW7nkJRjXWn3f/h313kfqUr6HjHlNJDcKEdUqzph5L4qr IMaUQvTpG5paw3NzN4OyKNTQsVd5cDWNC/qVEKmFBFCRP22NgCOOnrjVdoWiW5wzzhKY4e jEZfVmQqOeH13BvnJzHfifzTan0YrB6pWNHm+wRC5q0wB2jLEHVqF2r3t8M1eA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1750868157; 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=AY7YTo8FvaSdaGVXfsVnon1HJe/6EgNNVm+fL44JT3o=; b=ar41yW1nL2GengF4/8anxYdlyP0QHPtD5tn8PSq0vQWmg1uqrPZwpj4QIQJIJNkOJxGMFU +nQZjj70mbbwlpCQ== 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] ntp: Use ktime_get_ntp_seconds() Cc: Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250519083026.472512636@linutronix.de> References: <20250519083026.472512636@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <175086815615.406.2923173556935595786.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: c85f5ab60820bde1510110e403d17456fbb8c266 Gitweb: https://git.kernel.org/tip/c85f5ab60820bde1510110e403d17456f= bb8c266 Author: Thomas Gleixner AuthorDate: Mon, 19 May 2025 10:33:31 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 19 Jun 2025 14:28:24 +02:00 ntp: Use ktime_get_ntp_seconds() Use ktime_get_ntp_seconds() to prepare for auxiliary clocks so that the readout becomes per timekeeper. Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20250519083026.472512636@linutronix.de --- kernel/time/ntp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 9aba1bc..97fa99b 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -303,7 +303,7 @@ static void ntp_update_offset(struct ntp_data *ntpdata,= long offset) * Select how the frequency is to be controlled * and in which mode (PLL or FLL). */ - real_secs =3D __ktime_get_real_seconds(); + real_secs =3D ktime_get_ntp_seconds(ntpdata - tk_ntp_data); secs =3D (long)(real_secs - ntpdata->time_reftime); if (unlikely(ntpdata->time_status & STA_FREQHOLD)) secs =3D 0; @@ -710,7 +710,7 @@ static inline void process_adj_status(struct ntp_data *= ntpdata, const struct __k * reference time to current time. */ if (!(ntpdata->time_status & STA_PLL) && (txc->status & STA_PLL)) - ntpdata->time_reftime =3D __ktime_get_real_seconds(); + ntpdata->time_reftime =3D ktime_get_ntp_seconds(ntpdata - tk_ntp_data); =20 /* only set allowed bits */ ntpdata->time_status &=3D STA_RONLY;