From nobody Fri May 29 16:09:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gRpFY512sz6fm5p for ; Fri, 29 May 2026 16:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRpFX5D3gz3XFS for ; Fri, 29 May 2026 16:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNezKw+gEK3tcdD+n0A2OSycklKq/WRi2i7FrBIi8UQ=; b=IimWrBM2g1nQVc4Zij4GJEaASfzqW9NqzaTxv9qjsa4MQzwx0ig5ujoJBJhrrAFzDnkKJS NWt8HXzWymsb1iKKswYpHjFCvVrB8Z8c5+4m1NOyZujwKJFJF6MdZvOHV1zxN744qZ6MYB qMGs8NqcC8MDQqJxokF+1DymNsigUHv/1lbzhifPp7kOLdykLrqFRgpKgatE3UR8z1OWBZ I73dDtbKvZ6BXg/vagoLxF+IvjK4QjBK6WkNwFCYUNb43hYvTmbfrpTlXxKaE+FL5pvAWS TxKAgK5iYNzAkSGplbpFNn5BqMHHl7HSQMR1/CQkARaL2n/2+T1pzwaB3uTOyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780070944; a=rsa-sha256; cv=none; b=Ph1E7SuumAgy08aFwQ9/VmpBD8nyFqiustB0zD3gZ3oCFzWkjQdssXnNu4ixAxG8tZjQdf NF1hqsKTA0MJ6gNmsguQ0/4pO8bDkGFAKOvverOIBpi1X7pvibX6zQATuNeCywpSPGxTHc 8VG4POn/EzxgIAN07UfHI5WunD2pWqblNsJQ0zTfEmph/EFE0yrwkKrAI0Az4MA6Ur0nxU SzirNlY8511nXh72YkhRk+lGo4hG2tl6/Zmxqxk/A5aaOr6fsRfgfZTIlUh2BtUZZ2qPF3 vgmJwc6/z3kB5MZvKLC2jrtIm0KSM8moF8G5mpd389r9X9kOWti0wDsawhcGHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780070944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNezKw+gEK3tcdD+n0A2OSycklKq/WRi2i7FrBIi8UQ=; b=A9rz+OpYOiGxevh+v1hn93Q2LXeayzoo72X/CmK7qKCiVEzHzH+D9hdvKeRArXbsRPXjNk cI17EyboSGapkmXpJJFAFhQW/SMn9z5ZgMW9da6BuPng688EkZn70nTwu135dy5FvT2gVQ zlxKb4RN1I5SvuW/D9R8C+btk5W+bUfeg7pKhU4ivX0t0fdPyTqATMCW4B3S6Zki/ilMz9 BdwzWbM8S7iyvr1TC6igOeXm1eeDrjiiHIaQR+C0SiKMO5LsmZR1lzayKNWdGLgBG01pJd Z1KHLvicotC6FEU6n3a7I2wphT1+zGjC6thDfTVmy1LBshSfB/ky3bk9BGc2JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRpFX4kmHzgRL for ; Fri, 29 May 2026 16:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36806 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 16:09:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: ShengYi Hung Subject: git: 1a5ab1dcf4b4 - stable/14 - Revert "kern_time: Honor the precise option when counting diff" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a5ab1dcf4b4e6ddce97c179f888947ad983f8db Auto-Submitted: auto-generated Date: Fri, 29 May 2026 16:09:04 +0000 Message-Id: <6a19ba20.36806.5bdefbfe@gitrepo.freebsd.org> The branch stable/14 has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=1a5ab1dcf4b4e6ddce97c179f888947ad983f8db commit 1a5ab1dcf4b4e6ddce97c179f888947ad983f8db Author: ShengYi Hung AuthorDate: 2026-05-29 16:02:55 +0000 Commit: ShengYi Hung CommitDate: 2026-05-29 16:04:56 +0000 Revert "kern_time: Honor the precise option when counting diff" This will not work because this kernel version does not support a precise option. We handle the clock uniformly in all cases. This reverts commit 3886f1b488e47eba98e1523f85cb570694e97385. --- sys/kern/kern_time.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 0e3062d2a394..64eef90fc740 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -564,9 +564,7 @@ kern_clock_nanosleep(struct thread *td, clockid_t clock_id, int flags, } while (error == 0 && is_abs_real && td->td_rtcgen == 0); td->td_rtcgen = 0; if (error != EWOULDBLOCK) { - if (precise) - sbtt = sbinuptime(); - else if (TIMESEL(&sbtt, tmp)) + if (TIMESEL(&sbtt, tmp)) sbtt += tc_tick_sbt; if (sbtt >= sbt) return (0);