From nobody Wed Feb 18 18:46:42 2026 X-Original-To: dev-commits-src-main@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 4fGQTc0tGsz6Scy0 for ; Wed, 18 Feb 2026 18:46:44 +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 4fGQTZ6lmnz3bV7 for ; Wed, 18 Feb 2026 18:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440404; 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=sAaOTbYMRnafF5OTfy6UdKZcvB846cOyPRuxgGM4DGU=; b=fkkqcVyJP3FZdc28eK4gdmn60dNtkDDLNihoI9ApbATb1KyPJqE9JQeTz1X3PNdse6uBS2 X+llgsYY+CnCzkurhYijvCsP7H6DlQSzWzLtfJWIFCKXxaN+ZwASJVHDJTSXFJKNf81PKr 9cCGvrYyCBFGptjfxs88VwPy85K1q9qeZl4EPlsB1hz9uC6Efa9AXRAn9Z5QCJPAebfUOm t0kVkyox3sL2YcX30bsPgatdSASw/brNeTJLHCrttAcXKyHVmiRLFsaQHHndVfY5rzbf37 fXKH6Bs+Z/4MqQtntBPjZ4pH0op9jkc4hJYKLhT9rfWNnPa0aYHBrIhVtRbl+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440403; a=rsa-sha256; cv=none; b=Z4ERb1Biv2dkTTcTdRKPBQPZwFoije+PMkhbxWlVIag6zGGY8MiHCiUcIWcbd4PJH1K4Um r+JTWgWy9bdJw3DZ8fyDRknhZGYu3l19sVQNgdUilGiae6+8/7MvRJBvh2ZzkhO1vRtDaO Gfoo/Lr2Np0LyYkk4VuyUVCoy9YLGOSyqzKSAXOUAyVoN1L1z6rnwtabPXFFi2NdREmhiq kMlOrdduiacxoODOUzazRryYvLABQBhdGiIaZ6BgqEf1UYD6HxjUYh/xLLF9egdU9t9Cz0 0MuHK+ZAGWWRRsrjOlwtX4UQ93LJdzM8lxT/GrAiKImE2Azt+m+UGxmLoRBimg== 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=1771440403; 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=sAaOTbYMRnafF5OTfy6UdKZcvB846cOyPRuxgGM4DGU=; b=f2PK7G+woq/xBdnY7FYXcYwJ0+VmpEnaxPEtYOsiEZwcN/TmnFmsyI4NwJ7a8wd2ISU8xW /imIeJj8JDrc1/8GsSOB6atd8/a9MZW8yfTFJszq1BpO6dS6+OJUVKtOdtU7/qul56oOl/ dWr5A+ivJQ84hH7i5DiulfKfBoaC7LrX6nQa/T+OM/zVzh9KZeHO/E/35Qv+TqloaZ3Vjy gmIqAsDpRQrEAj8+Axjb8eJRbi0qvvw4QCWtiJ7nWrXlVQpN3kkynFxSJHP4bCvePRaZB5 r5/iTi98j2k2nZavryTlysbSROcA+aKCgaapf0sMSrv+SN/UXOVSjhqMSOP9KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQTZ61CWz16wY for ; Wed, 18 Feb 2026 18:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41bfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:46:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 45c1e44779e3 - main - Merge commit bfb276e55c76 from upstream OpenZFS (by Jessica Clarke) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 45c1e44779e3d365f5e31f75546d48ce34e4ee05 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:46:42 +0000 Message-Id: <69960912.41bfe.69fdf95a@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=45c1e44779e3d365f5e31f75546d48ce34e4ee05 commit 45c1e44779e3d365f5e31f75546d48ce34e4ee05 Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:45:26 +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 --- 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 14b42f2e7087..c72c3ea3648f 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/time.h @@ -51,7 +51,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