From nobody Sat Feb 21 21:34:42 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 4fJL426f5Lz6SJhx for ; Sat, 21 Feb 2026 21:34:42 +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 4fJL424j1Xz3P4x for ; Sat, 21 Feb 2026 21:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709682; 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=gHNOxXW9iYf4pCknoSFVuv7B1y2xCk0Sn9GmEhbraLo=; b=WPfBo3JfnxXtJfIDzM4wgPDaMZLFbtl58RWARKM3rAiaCDSvA3e8ivhqk1P4wzE+Wy2CYn 3SQUfm41MbQd2ghk1L3sXflXXYYTXzK6jgqZzbDX2w6pz7K1jcljp7S5pqo6R3KbP11clG sjvNMnstNpGDHuOQye/TPFMPMuSByv0TwmHqrxlsiICPWMsrnlw4uKPF5GQ7LrZkWXTRn3 d+/ysdvo1p2L35f0sWp7rgN8I6AHXiQ3MxiSzkaSzP/8l5Xy5qjvIAt2qkEMXbLsJeIWCa hKaNdFlZO1HZ0/u0wMf835ZLmA7YfRp7SPjKkob8s5Z2vYfql6Eie77HA149jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709682; a=rsa-sha256; cv=none; b=gOdjfrsCwu9TQ5OgXEajVe2v1RnZ4JAIcdpEUrCbodMqv2m+Gy6uDDNt0r+pC1w3GjeVoQ bVNdKdE3DAo4sZbI94pWrAKJBO3DYyhqg6pM2icQe0toKVtlQX3Xkl4UyAzjlQ9bWybtX7 82aPbMMTRwjZXUytW38XL4mf7bAs3M6qfPzycEVOICNnmkyBPTs1pS3fQ1yCLpdFpVVZWt XUwEaGCx0MZbYJytuocGTHQc4z4laanb+6xuId1w31sBpes4f/sWP3tjJ2mB//d1f/xGpF j8Xj8HCRzE4D2VWtHwJyIXJzTPZ75uUi3pO843gHSrj73FyUVF+cLCcPeVBLUw== 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=1771709682; 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=gHNOxXW9iYf4pCknoSFVuv7B1y2xCk0Sn9GmEhbraLo=; b=Xo/P4/p2mdl5GJprknOExeApxXEykOu+3VJ2uROA1zg7ZT8WTPy9p94fRx3u+xVhJxPpLQ kmppHT8hTe4qwuhXiAbl7H10cxFrGU91EI9soeDJimzpFOatviC6vjRTe7noYYj0qeTBun 9mXrae3/KVhUPLPhkkcXD2Oq9bz3q3QtdFVGnhLNo/okRJHuMwlEJdT16iihEOQ79Y+bjK EjL7ZDnb3OLTFByRb+NdOyYhR0kSs4MIp1odSJSoqX/1loZo/4OC2AzxJFMmtWdpYHV6sG q2K36JeQ1VQrsm9bSOzdKhdHwt5S7NuPCwk15CZqRhcmTmx0rnpvslpHs3FyXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4240dKz1Pp for ; Sat, 21 Feb 2026 21:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c3b1a6ab18cb - stable/15 - sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c3b1a6ab18cb4911c0fe05a21d5dff8b79a7ec4b Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:42 +0000 Message-Id: <699a24f2.220c2.3a6a4bc4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3b1a6ab18cb4911c0fe05a21d5dff8b79a7ec4b commit c3b1a6ab18cb4911c0fe05a21d5dff8b79a7ec4b Author: Konstantin Belousov AuthorDate: 2026-02-05 19:08:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there (cherry picked from commit e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875) --- sys/compat/freebsd32/freebsd32.h | 18 ------------------ sys/dev/mfi/mfi.c | 2 -- sys/sys/abi_compat.h | 22 +++++++++++++++++++++- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 7d21a5be5570..cba8474b5bfc 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -35,24 +35,6 @@ #include #include -/* - * i386 is the only arch with a 32-bit time_t. - * Also it is the only arch with (u)int64_t having 4-bytes alignment. - */ -typedef struct { -#ifdef __amd64__ - uint32_t val[2]; -#else - uint64_t val; -#endif -} freebsd32_uint64_t; - -#ifdef __amd64__ -typedef int32_t time32_t; -#else -typedef int64_t time32_t; -#endif - struct timeval32 { time32_t tv_sec; int32_t tv_usec; diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index a7d98f06aea3..474afcff60a7 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3084,8 +3084,6 @@ out: return (error); } -#define PTRIN(p) ((void *)(uintptr_t)(p)) - static int mfi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct thread *td) { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 2fcf598ceb7f..1753d8dd25c2 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -29,10 +29,30 @@ #ifndef _ABI_COMPAT_H_ #define _ABI_COMPAT_H_ +#include + /* - * Helper macros for translating objects between different ABIs. + * Helper types and macros for translating objects between different ABIs. */ +/* + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. + */ +typedef struct { +#ifdef __amd64__ + __uint32_t val[2]; +#else + __uint64_t val; +#endif +} freebsd32_uint64_t; + +#ifdef __amd64__ +typedef __int32_t time32_t; +#else +typedef __int64_t time32_t; +#endif + #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v)