From nobody Wed Feb 18 18:49:12 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 4fGQXT2Gc0z6Scts for ; Wed, 18 Feb 2026 18:49:13 +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 4fGQXS658Qz3d49 for ; Wed, 18 Feb 2026 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440553; 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=EmYSfTDUBI+G9QXuDX6BpLyxtQfWZAxNue0u4OkiAnQ=; b=ynbq4DCTRUXTxdcsEepZ6brSlAh6hbHZsA+jYEJrhdZrRM4PidfQeJ3xZbDlYK+sfRMiNS QEPNInzb5li6BTu3UHB4cF4q8CuCKYS+tWnRM8phKXxKrPYno74DWuFI0wiR4nVjJvls0s IIwAcBlcpDiySX/FOe28T4pRlFTFw6T0sLm0DiKVj4aPRNi5oiZkf6xC47TfedoRwVlb4L 7P8wi2llEtf5PtrOJCe5O5qnw4KAKujn3tYCGI8nmmdh1wqtkM8fBDtd1Wkl2fEwtFyT+t QhJ2Jx8xKuA2zaxwrdCBolDrog9bBVQDEnD+iu/sB4tHd6k7mBihyV6VzXugOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440553; a=rsa-sha256; cv=none; b=ZgQe1SEyX3pLb8iA8dcfkGycea+aVoFBlZ8jkeHHdS9JaW4j18DPFU8Chlpm5iw8O7hQsq mgax0REj+PwBoZ9S1Lu3mqyfP6U7sYZClagbNknKArUCGeLKuY13ANNtuYY3BkGWseXkRL 5DWiH/R+LNlpNU0084Ut+WLnSOgeTAgblP8mm+9QG28O0WYhcbHsk2g2Qf3UQBSSYw1Ne7 8wvYf9UqjLOQogoSu3bJGW+XmtbW46CuzZFEw6nWnR73FnspdB+f9rMZI4uey3Ygonkctb EAC6dSff3yK7uEGAwj8NpSjismuR+KCBTNGOs0LDnANecepdTCtQFiOT3QUeJQ== 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=1771440553; 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=EmYSfTDUBI+G9QXuDX6BpLyxtQfWZAxNue0u4OkiAnQ=; b=X7Pkz05OSHrgPIvDIQIuCyDmi8zYXbA9pXSCUU77e6AqRC9sECOIJ6UPvP9Vqrtn3uxbM0 P/A/BVvp4xl3rlujFewu+bxXiWnCDYh4ipI2T4hDS95ABDLbsVWgLs6nxcsSm7RiQWN3mg KhVVJJ/mzgZb0aJL9lBzgHxZaDOs7v5DmuBfybLLZYmG0GZ/7B1ebfJYfje016xTVRFPrr O1i9hg8tw2cGZOjJ+5WT6yHkgip/mPUKWUO3xYpa2mirI/PKgV/DHmsj7hdZaNvsNo5DNm tdEypeYEpnYkkosHt9zdeiBa9oLGpYLrciXObM3gzUWziZkcT6EO5ZKHqVwkew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQXS55zCz16wg for ; Wed, 18 Feb 2026 18:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 410c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:49:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: ddefff3810c1 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ddefff3810c1b40801bd99f42533e0d414fa0236 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:49:12 +0000 Message-Id: <699609a8.410c3.d78fca0@gitrepo.freebsd.org> The branch stable/15 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ddefff3810c1b40801bd99f42533e0d414fa0236 commit ddefff3810c1b40801bd99f42533e0d414fa0236 Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:49:01 +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 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