From nobody Mon Feb 9 19:06:59 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 4f8vM75mTtz6Rs23 for ; Mon, 09 Feb 2026 19:06:59 +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 4f8vM73H3Cz3C1l for ; Mon, 09 Feb 2026 19:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664019; 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=Dr9rlN+jFQXpBfNBG++7n7M60GNunt4z680rTPjIrdE=; b=oI5h5Mq+xUvUFT0ZcaJPnVV0AU8oBM4JtV+1L+lVlv2FL1XnD+hAp+419pFXgwTz40rKjh G0qvKzjRY/EaB8RBw/WYUjnYyGqxArfVH1q8B6OhvNbVFrK0j0GwN772z4I95OII+3HaFi hnyML+RDRLad6K+RVCgdJ2o9dLm6WX21BxkTtIR9ZCFQnzNrkOvQ/96sqZSME6nKs3dIGq F3qqndtX/zeHS/Wy/AqAxX2PJEk8ZwcIJ/F06yxQ3zSLxDrGXd5SEWdn5zChdNq5IDY1mb 1Vg6YuNu79iwO+nTEazdP6UXaNQllq2SJURF+StutbV2XCfHNJdCNmn/RoGjcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664019; a=rsa-sha256; cv=none; b=ZGyvSG0zypAyliSanDRlnFovDUVNt2BEelitwl/LVsWk4i6kQAYnDuec/Blu3xOSoVP87F WhGN4dJDhoXeKEIbGrTzJ1WmYgjRvtksj+1A917xCzn6I1NyuKHIgVbHCVyj1r1RHtx/vr NwvBHKwby0GGKo/yazLh5aU4wcO7JxrFJXdl57FjpVCGeUrxLC7Wz50D0eGIZEozTcjhb/ PYyeoAnFwvj/leUtfwivABkzSx1NBPSsrSj+XiGtntcyDHjGdTFQp/r91QCG2+Cb0GZGOq MHWmZnf4fCSRCAJuJhxZiF0F0nnTwB8N6n/8pipdB9jky6y8a/o7/dwDMj58pA== 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=1770664019; 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=Dr9rlN+jFQXpBfNBG++7n7M60GNunt4z680rTPjIrdE=; b=uG912HPYcIlZIiIomOGy3tdDFrv/FTJmUgWMUQU/xqciLj9oWjHMUAJZ8Dzui2orGZgjTr iv1IjnyyVZ5cVtlkFz/ZqLQp8KMbtIanJtXDekXZvRJ27ghxFLOaeU0MwP0lEhu3qCTqic Wu9Ne5SsGWnMEpp9oxIenQSRweBMTftGqWAFAYClHo0jYoHNOsYDLIEZ7iRSzQL7Izdy08 cKywuM5ktf5zBmwxwZDfgS0+S/xyys2dZHMC1cNnKSlpbysYOGl76a2fzlOU1gFdiweL+V VBu5G+gb3QnwaFrOFTHYImfNjzyXRMdOGOugEzwaGp1TWwCDFTZW62TirBrpQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM71vT2zlRC for ; Mon, 09 Feb 2026 19:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 485e916a67b4 - main - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 485e916a67b4e700de5f50873e1e7b64de394b16 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:59 +0000 Message-Id: <698a3053.347cb.5e4af63f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=485e916a67b4e700de5f50873e1e7b64de394b16 commit 485e916a67b4e700de5f50873e1e7b64de394b16 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:29:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +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 --- 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 1b8d2b7fe084..15e075174786 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -451,12 +451,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 544842803e21..25a8558335e7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -739,38 +739,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; } }