From nobody Wed Feb 18 18:48:25 2026 X-Original-To: dev-commits-src-branches@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 4fGQWY4HpBz6ScpB for ; Wed, 18 Feb 2026 18:48:25 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGQWY1nJtz3c6s for ; Wed, 18 Feb 2026 18:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440505; 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=lnYZ5fP2TtSiLKMjl3up77zuWr0wiLvCfdyNIhDqqLo=; b=XJnOK1mXQz7hknn3c8xszuoveFihFm4QM/V5SKe6R7+2Ez9eiCHN3d+1/s1FXsX8cGKdRE wlSL+JiXBpOnCvKR1V3D7K7g6CIcrcdi7Bfl0zDBuAVBlEvJ9RgeJNU5LQtEtIFJKP2OG8 gDXR4vL69gxnnASJGPh7FMedbEy5jWkuJesKRK9vRxL/ClJ3h6W1X3eLbpZFfIKlhNyGhq wnvNclUqkSpX92ATUMLgmX7sXjIXrngVf1rh7pH/LfY4X3t9M2QVo90xZNL2NviD1XBlNx HjpgCOcbM1RvlgLT+7ZrtfDq+40JJoAuzlxg5nB/oWU9x4qyrlrqr5eS20XhxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440505; a=rsa-sha256; cv=none; b=r9HKQdQwjTPM4ytTiKkaOzkBHRWEfZdcRoQOYWa7TciQNdBUBY+IEDw8dmxfKk678ZSotY c7vZjbBAXH391mO/5rpHr6NcloIXqQclhspLU6EVSjZhQxGYBZ9Ac+OaVR7GaZ+Q3CahoE UpA2ENkbhOJvTtlvce7e7rKbU1Xa4fmG4yam8CmRMPIKmcDMYoFpZGPN99sOD9bWJ49oqp 5dt/Gv99ISr7H7CyfOGjUYitOa+TadG+taHJD7wMCfScajq9tM3Oa33IVWFZEaKaEXRA1i OaHRcjmIt/gfKPl9RS8N9g/O4B41Kynko/FGPt29yVBqIcOGp8x1ITsmuv4H1g== 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=1771440505; 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=lnYZ5fP2TtSiLKMjl3up77zuWr0wiLvCfdyNIhDqqLo=; b=W6nXcNjgSA/BZZ7Rxrf06K3kciZqanPlrZ1lByg9Am0hglTi41q5/wqH3gXFH1hdZPqB0c DuhPxqWUaGJXtW8ufMyuSZuiQFJl692XesMza+63Ply2MN8skju6gJ865SQxpcc8/rLtJp SqXKOZf6CV4wcJmgkx7DmBRZB7YqoPZA5B6Ka5mSv2dPjzsPlgJHHkzTGEqzaD+eqasSAg 0elmHmWVYacK8+hogrMgwMQA7QKFUqdaDV2VT4KCzsJfrKNCszzZOPUisBZ+j+JNKn5QiJ fe2JbpqKTBMf5gEZCfwVPo5c7fekD08q0I8ZFG0gogYmnTbCsB6IJ/G1OiaUow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQWY1MRsz1697 for ; Wed, 18 Feb 2026 18:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:48:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: a82128d03d36 - stable/13 - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a82128d03d36c8febfb0f0faf315128df03fb89f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:48:25 +0000 Message-Id: <69960979.41c31.4739cf79@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a82128d03d36c8febfb0f0faf315128df03fb89f commit a82128d03d36c8febfb0f0faf315128df03fb89f Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:48:15 +0000 Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) Once upon a time, 32-bit PowerPC did indeed have a 32-bit time_t, but FreeBSD 12.0 switched to a 64-bit time_t for PowerPC as an ABI break, which predates the addition of FreeBSD support to OpenZFS. Moreover, 64-bit PowerPC has existed since FreeBSD 9.0, where __powerpc__ is also defined (alongside __powerpc64__ to disambiguate), which has always had a 64-bit time_t. This code has therefore always been wrong for all PowerPC variants. Fix this by limiting the 32-bit case to just i386, which is the only architecture in FreeBSD to have a 32-bit time_t and not have broken ABI, due to its special legacy compatibility status. Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Jessica Clarke Closes #18217 Closes #18218 Reported by: fuz MFC after: 1 day (cherry picked from commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h index fbc679aacf93..396bdd6ce8c6 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -52,7 +52,7 @@ extern int hz; typedef longlong_t hrtime_t; -#if defined(__i386__) || defined(__powerpc__) +#ifdef __i386__ #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < INT32_MIN || (ts)->tv_sec > INT32_MAX) #else