From nobody Sun Apr 12 05:57:08 2026 X-Original-To: dev-commits-src-all@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 4ftfv85qBtz6YYtw for ; Sun, 12 Apr 2026 05:57:08 +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 4ftfv828tcz3mQ4 for ; Sun, 12 Apr 2026 05:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFVyT6LeEU6tAii6yXnnMcKAZZAgkNuQQKGhJoarEX8=; b=WDbH8S/inBKHneQJ0daSmkTzZ8/UHFDaw+ROZTsmfFVHYwNDlpXc+IgRrR8/ngtpbP2uIz 1owGTQFWoriTwC5sFxr2qEo4iAdzyBClfWdDxmuLVW4oe7WBmVG1EO+f6TAYYrlrYs2sWJ mhI59y0MAUuqLcFbrGtoFsIRHUoZGCzzH/PRCNivj3Dua6Ci9OuYghKzD/YBhlM/dc/3CV WvszEn7IG4WXbTs1gpIYzr2Bketqeey0gSmgO0eC7o4+njekhyD7tWBI207gOnzg8u1N9e 5ihKkdkPCceX2Diq+7mCRBp8hXZ4mLkur/r5oBZR/MaWikkbfqV25krk5gurnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973428; a=rsa-sha256; cv=none; b=tv2exq5WbRp7KJEBo6w0VUFVPxurOTEl1FM+OMmfMSaXtdh4GEDKDfvfbzJ+l5zH/MEMRL mfnNzs9s/DYrBTHsNYVX0kGG4YPDMZgdef9alCUYGYVxYjBKdCxVzI0CDZfy12jmJLWzwo UN2svofVvFy0Hn8gVEhRsWutDzyBiq7mVWkD8jWHxI8HcbuwoAEauoUwyUomVD6jo1lHeA jNnsuCvO9kP8sVlVl0nSuiPygVJIYbXoV5nlio4DAOCj8SZQIkM32yy12XoXxsWMngXTEu zPF67+V693eUstpegaJGvusHuj0ZU17QIXLFN24wHRZj+LvnQYYMjaJWGXyHIg== 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=1775973428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFVyT6LeEU6tAii6yXnnMcKAZZAgkNuQQKGhJoarEX8=; b=BMgy33nkXMNE6BN4q9v393E5hGoM2157jlnbaQUlnp6vlYHZyo3zS64RBx0OJivUbuDgFI hB1U0I9mCjrs9TCTzRsIPp/0EebLKAMKh48By/h1RfmqDjgIefr0KvgRjHqKXy5ugNI3RD R66p5q52Rk9cCSQE4Ur/mspmxKjlPBywJhbF1VKXDu2kJkyzv+F1iLZs4DnfeN/KuqWPHP pSgiFCRCS8vVSueB9lUIo3GF/9MhozBl+EhST893HSrIMX7UYadMBl/RDA/q4ayuqK9LJU ggXF0T2r04kzrYKIuDgEJ66OIMOlCyBIjmdfUjxphn13J1F8aOvnOwwZLSguEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv81RtSz1407 for ; Sun, 12 Apr 2026 05:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3127b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3222cb7d213c - stable/14 - sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3222cb7d213c05787e6a3db0f73caa5778e6ec4a Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:08 +0000 Message-Id: <69db3434.3127b.314a7c53@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3222cb7d213c05787e6a3db0f73caa5778e6ec4a commit 3222cb7d213c05787e6a3db0f73caa5778e6ec4a Author: Konstantin Belousov AuthorDate: 2026-02-05 19:08:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there Use private names for uintXX_t types. Remove conflicting (but equal) PTR_IN() definition from dev/mfi.c. Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (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 b5671611c1eb..b8cd29e5238f 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 cd84e0a1970b..af88085116c1 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3082,8 +3082,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)