From nobody Wed Feb 18 18:48:53 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 4fGQX55dyjz6Sd3x for ; Wed, 18 Feb 2026 18:48:53 +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 4fGQX54lrXz3cWc for ; Wed, 18 Feb 2026 18:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771440533; 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=rM24S9csfgFL9etDeu2NIa73IgPuc2j+LwOOn6yiO8c=; b=Ojg4UzaSQxLabivUYsD1ifRUn0mvWA42EQPPicttIrbLJqx+XWEzAJfmcjuRhqTRRSGGw1 FioPVNmHbPLc5RVpC1cVnph0ncO1hwp+65ZxZcwZqWp93k5H861lP0CM5nuAhb91rnr3Tz 5ULvrlri4e8TTQLTde6/Mlu29Vu132/UeBKMciSwyQJ5ZrbhYDDQhSxDuFGZzsgkKlEUhe o8qFWRggL2jvjB3G9vHq2TQdpk0COb3/Pg8HRyaiAVwxgL9/B/IsUgE0qDzQnHI/pnaJJ0 I6wnxqKMnVGSUKvfAIwxQBcG1hFA0s77lX5TsJEp6x9sOQTN1QTmj/I+VUBF8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771440533; a=rsa-sha256; cv=none; b=Nm/0rVJuqoQJ/FnNpggXMgQO/gSAA0ow1TjK9riogLCSQAJig8iagIOqgh8Jmp3T0D8aX6 2aT9F7H+q/v2bzCLTRTdl5P/SaRL9t9/zbi2LXkIK6YkF3ZyXnjSdt2AkdE46Dx87mAxFX U9i9LiNt1omEgCoYhfqYUZmz7ujawlhRI0Ft5laKxRBkFzutjp/+FSmASTfN8UR4gS9AWG Xaj0sgobQKoNg7UMPGz0//XkmRyatV8ovH00MmbPcOySCKTfizSgqPXyyeY+JHoAd2zKuR x5g1RJWvSddAN0uhjpCVCl1j4EEM3yKr8nAaRcihcXZxd4iv7dtZGh8jeiEwTg== 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=1771440533; 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=rM24S9csfgFL9etDeu2NIa73IgPuc2j+LwOOn6yiO8c=; b=lJSqiXfVb/4I7oNtoz2tGgNREXJRiwQh10e5hkEQDpEnb/Kc5PbZrbBt0u65pafWQkf+1t DY/cYJ84m6nJtpBwYgZ4nTbMNzjUe2hFs9qJ0d5dFsjJdM7cCpXP0fazJ+Wsk/WbvWh6nk JveTy1k695oqWLeDzsY2GhR9ou+Gy5GWNfC1/udchotWNQ0g0WlSHUF6arsa1iSU8Cod/i FIl+JY3Y5cPftv0WPWHd/xqog8MYhoWDQxFds/CqiFeWUAayMUtlaWLguP/jWnyu5b3p5m FBUt3P+UuhTovz2Ub0wEEBCam3nrGi70wwCUixSZwVEzBcstxOexWLVtRj2JGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGQX54H67z16wf for ; Wed, 18 Feb 2026 18:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 410bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 18:48:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 354cc5e14263 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 354cc5e142634afbc967ede56572b939fbdb5d38 Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 18:48:53 +0000 Message-Id: <69960995.410bf.1000f305@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=354cc5e142634afbc967ede56572b939fbdb5d38 commit 354cc5e142634afbc967ede56572b939fbdb5d38 Author: Jessica Clarke AuthorDate: 2026-02-18 18:45:26 +0000 Commit: Jessica Clarke CommitDate: 2026-02-18 18:48:46 +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