git: d94d93b83aec - stable/14 - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32

The branch stable/14 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=d94d93b83aec816985632f78eb5c29e0e9c095bf

commit d94d93b83aec816985632f78eb5c29e0e9c095bf
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-02-05 19:29:46 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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;
 	}
 }