From nobody Sat Feb 21 21:34:45 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 4fJL464J5Hz6SJlc for ; Sat, 21 Feb 2026 21:34:46 +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 4fJL4617sHz3P5Z for ; Sat, 21 Feb 2026 21:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709686; 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=LkbF7tCZO5nTolXIXTghq9zgUdOFJngfvHI0LYdoILM=; b=xseisx62renjCT1gJgEquc+I/xkHVbp+BYO9bHZ3D7QAvkN6EcgSFw4JiQT/4Kd7MJWcYf PIilqHVoe3fxG/+LpxKFz3f3gwZ6+tGbG4GcQyikL7PyCHlqA2ahPehK30FUEHGJ3sk/UN TVGFoBSJ9yyLebtBbYM/2i+UkxpLDo/drIMsBkt3ZIEvH9um9ZklOA8AFLZsEXCdANEqB4 pJ3rz7luWcq0RxWGSBsEsK8BDOn8jxNLNhRXhZjfxFC0mqBY7115CTw2uNiSfgWSjKoqMn lRDQiXprhKXvol2Z93dzcNTqIZBdpgO/MPihdWhI6IGfZHiSb0KYargOgA7NWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709686; a=rsa-sha256; cv=none; b=ruE1SRWRCV1s8lNtRpljysSuDL+j35f5AViBQ8fS13Xt1DnaWR2WG03yfZ9v2vo3DSwkIa rD7U8T54RGovwK9GlP9RoyUIJwqpDMikWs5aB/+5w1OWWrhevqxOTkFVjQwV3AkhNSNiYG N65HqjZWc6jN8qbeoF5SuFncatToQ11FnKnC5xGE98E/1+sjNF9egPXH6R2ua5hoKzlhi3 oos1zug2CCrYf732x9ioy51nI4921Cn/PoEx/f1Nlq9Ut44e10U40RG0U9B6Y2l+7hsd9p 74rLjX9kdRIMUltH4RDwPwMwvMzmoTuDxiCbFommPGVys3urjKNTZviF3Iy3Vw== 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=1771709686; 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=LkbF7tCZO5nTolXIXTghq9zgUdOFJngfvHI0LYdoILM=; b=Q1D/BQq6KHckam2pFUFcpuAIwz4rB6bq4gHRZQoAqwD/CXzR8Yw9i6wCegUb/yWcbCELT5 sZConD5YvyFY/GiFRSabgMVJ2gK8q3QrMj5N18H8ebDq1DVYQo1E7Be5gCL3Skoiy1Mfj3 zyNVTX7AxRh5rL9QrnOLP1t1g2EAgWeTAcCZb77p5KxOBJhmxl8wy0qjBZYzwhMdfpIGgO xdv1AhY89yidDG/AnV0sXgwr1Z+M7w9VF06emS+FF6rXWE8Qlv50X0GTKEAEfcXZCfKnSe ZuZTrky8MyrjwvArzy16LAMBIbgQufQtvKfpixKDZaPeM1sid9qyv80AX3MtIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL456S8wzrK for ; Sat, 21 Feb 2026 21:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f4f4f2783c6e - stable/15 - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 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: f4f4f2783c6e015a79396689e34807676c87bc02 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:45 +0000 Message-Id: <699a24f5.23304.329adeb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f4f2783c6e015a79396689e34807676c87bc02 commit f4f4f2783c6e015a79396689e34807676c87bc02 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:29:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:07 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 (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 cba8474b5bfc..7dc1c5d2302c 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -448,12 +448,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; } }