From nobody Sun Apr 12 05:57:11 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 4ftfvD0GXPz6YYxd for ; Sun, 12 Apr 2026 05:57:12 +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 4ftfvC4Xswz3mQP for ; Sun, 12 Apr 2026 05:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973431; 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=nb1jT4rj0Nd9xHGPnKC9N+PuBRqiy7YN+dh2MTKSbI0=; b=XfOdgvyawXTR9/KjJmXIcuHEXtK2hMya6CGvBz6FeA+LygrG1sQtDqWXsWoTgwuQmHZ8bM LKwkvTjhiTO9+tnoID7QhpRkwkLIuhjf0EfT7KQNU+wlUeEP8o+TlXyUoBygOgEqCp0RZn gykF6rKPla5cjXrfSpBMNr0xf0XVB7LfQGnHZhy9AsK8StNFJyhR2RmFSf1VzyoC80C6sQ sTYs2DksaoijI3jZAcn72uDmTPxgPs1Rw77IESKN7NDYY7cOhDgWJGvwsDm7sZ60q87C52 EgMhpTpoQBALbtgAlbbGT0+A4leO/1w3s7GCJPNiLTqc8shVj5UDO1WZCBpgFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973431; a=rsa-sha256; cv=none; b=o+y2DAO6TiXsbm4FNGGrO6P2d1kSE0ZvBdhmDv/DkCvYb/rUdviK8PadGc6K+JJWrgxCkg ZVDJQIpxoT/5LWSGD2Fz7aKBPFAm/bFyzbNP9W7gpKZI7+MhayNRcqlpLd95QbQ3/Gr1OG Buvg/nt/QX5Z6qtEn6271MEg4pCTvCkKM83OBCUgWqvmAjEeXHkfAlsioWUt4LYshSliYL xoIwMGih3XfDJ+PrXltEbmZ91zgKlcsOuxyc9LiN9NajyTupGSL4BtJqaGlEbJsim5Kg/g RFCZd/UjjrSSVKVub/oXOtFEhNogHKlz2rTt5EWaQQmukTlZ8H8xn3/3xgFv1Q== 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=1775973431; 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=nb1jT4rj0Nd9xHGPnKC9N+PuBRqiy7YN+dh2MTKSbI0=; b=s+r+GjUi38QESNmLCVFqZU2ESj00BFqZAHK4jNvHKCD7deqZfsn4FJUe1jWklsr18+2mNR CsEW2Va/L5zkGSrNn5+KVz9GWnsnBLuPxEugQf0vFtX9hqw9sss5SPppy+dNL/Jjz5nKaH phuef9TjwmDn18Y29mF+wFpaz+ieb1u5gsSVdRtgNNhV3tjPAPEq3MOmt12hWE8orO7VRI a+vIb2a8FxW5v3cA+jDB/WJjZCq3g7CRvsSHMTTJvD2XJ8WumnHB8XY59LvHXMqk/OmSER o7Lnp2WJ/hEcmekKNEPOWL733hvwFLMipO80mZ67N4AvxzyYHFUYMBVWKuOtow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvC44NRz141k for ; Sun, 12 Apr 2026 05:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:11 +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: d94d93b83aec - stable/14 - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 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: d94d93b83aec816985632f78eb5c29e0e9c095bf Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:11 +0000 Message-Id: <69db3437.31bf4.7e5d3813@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d94d93b83aec816985632f78eb5c29e0e9c095bf commit d94d93b83aec816985632f78eb5c29e0e9c095bf Author: Konstantin Belousov AuthorDate: 2026-02-05 19:29:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 485e916a67b4e700de5f50873e1e7b64de394b16) --- sys/compat/freebsd32/freebsd32.h | 6 +++--- sys/compat/freebsd32/freebsd32_misc.c | 31 +++---------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index b8cd29e5238f..1cc32f102e08 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -447,12 +447,12 @@ struct kinfo_knote32 { union { struct { int knt_vnode_type; - uint32_t knt_vnode_fsid[2]; - uint32_t knt_vnode_fileid[2]; + freebsd32_uint64_t knt_vnode_fsid; + freebsd32_uint64_t knt_vnode_fileid; char knt_vnode_fullpath[PATH_MAX]; } knt_vnode; struct { - uint32_t knt_pipe_ino[2]; + freebsd32_uint64_t knt_pipe_ino; } knt_pipe; }; }; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 90a4ee466084..9dda5c3ecd1e 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -707,38 +707,13 @@ freebsd32_kinfo_knote_to_32(const struct kinfo_knote *kin, break; case KNOTE_EXTDATA_VNODE: CP(*kin, *kin32, knt_vnode.knt_vnode_type); -#if BYTE_ORDER == LITTLE_ENDIAN - kin32->knt_vnode.knt_vnode_fsid[0] = kin->knt_vnode. - knt_vnode_fsid; - kin32->knt_vnode.knt_vnode_fsid[1] = kin->knt_vnode. - knt_vnode_fsid >> 32; - kin32->knt_vnode.knt_vnode_fileid[0] = kin->knt_vnode. - knt_vnode_fileid; - kin32->knt_vnode.knt_vnode_fileid[1] = kin->knt_vnode. - knt_vnode_fileid >> 32; -#else - kin32->knt_vnode.knt_vnode_fsid[1] = kin->knt_vnode. - knt_vnode_fsid; - kin32->knt_vnode.knt_vnode_fsid[0] = kin->knt_vnode. - knt_vnode_fsid >> 32; - kin32->knt_vnode.knt_vnode_fileid[1] = kin->knt_vnode. - knt_vnode_fileid; - kin32->knt_vnode.knt_vnode_fileid[0] = kin->knt_vnode. - knt_vnode_fileid >> 32; -#endif + FU64_CP(*kin, *kin32, knt_vnode.knt_vnode_fsid); + FU64_CP(*kin, *kin32, knt_vnode.knt_vnode_fileid); memcpy(kin32->knt_vnode.knt_vnode_fullpath, kin->knt_vnode.knt_vnode_fullpath, PATH_MAX); break; case KNOTE_EXTDATA_PIPE: -#if BYTE_ORDER == LITTLE_ENDIAN - kin32->knt_pipe.knt_pipe_ino[0] = kin->knt_pipe.knt_pipe_ino; - kin32->knt_pipe.knt_pipe_ino[1] = kin->knt_pipe. - knt_pipe_ino >> 32; -#else - kin32->knt_pipe.knt_pipe_ino[1] = kin->knt_pipe.knt_pipe_ino; - kin32->knt_pipe.knt_pipe_ino[0] = kin->knt_pipe. - knt_pipe_ino >> 32; -#endif + FU64_CP(*kin, *kin32, knt_pipe.knt_pipe_ino); break; } }