From nobody Mon Feb 9 19:06:55 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 4f8vM43DqFz6Rs20 for ; Mon, 09 Feb 2026 19:06:56 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM40pYLz49xM for ; Mon, 09 Feb 2026 19:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664016; 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=qSrF6BgLjH1EeDXVyT+k2kKV9+GEMHILwyUWpAZmRqo=; b=HzifR3FV1uheyK0AQ8YxKIg6P8tGrM/aEh34kmma1oqMa+H6FXoXdZvHPNYFVHiev0V7In tfLY7uMSE5KpV2Sk+PSF8FUQeNntnU6IUudhCLaVsrk50pZKS4w2WZuMYGrtVxGvB+kLD3 uiiFhXv0GAuglMev0y3FR7ys1twgM5GwFOd9VuZJVOY+InU+hTVxXzxg20e7KM8+md5Tm/ Y+CxkM1rZV9phz4HkUgz3yd3RI2Xsdz7zdyZ1CEq6rlvNSV4nyM3dgVbXHzdydR0lrPeej FLs/fLKtiTzFUTcOhiEXjlDPdnr1NEkombZnXGekRNanDLvvIwWHtWbo1L7e7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664016; a=rsa-sha256; cv=none; b=Anur0O11RSwr+tqsX4dLhExKEHSMmQmgDs4Yesy6Ak0/V6GmQryYhCzJmS4NVm4nnawLyd ai5VIfY2cLsmBjLuobd70Ou25NysX8PHn1hmHQGpIUVCkhv4BwlOfpDNhSAJM43po2C6zs 9K+iXK92DgzAK+YUiU12udm/Vupqle3NSi25z+a1FMrYxQ9esrSAYeYhDsRA+83rn+2FBO 83r/uB2mHdqBlpLb9FRa/igm8yF0YZX3IDLBCpXqF73EH7dgdeJocyEBqN3j7mIxB/4r7I od/rPEmtT3M0Vxid+gJDfkThq7mknQ41ipZfCcHOoLAvfW+wqXm+Xa3ihheSuQ== 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=1770664016; 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=qSrF6BgLjH1EeDXVyT+k2kKV9+GEMHILwyUWpAZmRqo=; b=UeCyysdzXfw/bVT8+OO3CleOem6JZEWNouc5veJSMV0fQD/dS3RxA08Iaf4UIatBbJOZ7B cOlQtcMPSCCNwFA01fOzheHhyOTrb/8i2uAmulvrK99EgXCMv3HaaJwho7kT9/R/D/e152 PyLnrqxaLBUt3PcWCuoV9aIY/FOU4Tj7VwRSQSXX9wvJbgzwSpMtpTq0ll5w6YmG+vAGXc QxBtNoM1xJv7yQF6M1JbjQgo1h3L/7UPz9VU5z2w7HfNWSibwo1I4mwC5ETb01T7O2kYAN TEKRqVdqyS/B+YwEYhCo3/SXBarponu7/oFQR5CrMp/gdRxUmxg4govauCvN0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM370SwzlVD for ; Mon, 09 Feb 2026 19:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3662d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e651c64bcab0 - main - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:55 +0000 Message-Id: <698a304f.3662d.769dc949@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875 commit e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:08:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +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 --- 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 25703859a7bb..1b8d2b7fe084 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -38,24 +38,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)