The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c709baba436dc0ee36c8ea0d0b272ec1130dbe55
commit c709baba436dc0ee36c8ea0d0b272ec1130dbe55 Author: Konstantin Belousov <[email protected]> AuthorDate: 2026-02-05 19:40:55 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2026-02-21 21:34:08 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 (cherry picked from commit 31fab773613b21183fbd5a313fa8c69d37fcb196) --- sys/compat/freebsd32/freebsd32.h | 4 ++-- sys/kern/kern_proc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index ece7ace1e862..d742139f9dd0 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -371,7 +371,7 @@ struct kinfo_proc32 { u_int ki_slptime; u_int ki_swtime; u_int ki_cow; - uint64_t ki_runtime; + freebsd32_uint64_t ki_runtime; struct timeval32 ki_start; struct timeval32 ki_childtime; int ki_flag; @@ -393,7 +393,7 @@ struct kinfo_proc32 { char ki_moretdname[MAXCOMLEN-TDNAMLEN+1]; char ki_sparestrings[46]; int ki_spareints[KI_NSPARE_INT]; - uint64_t ki_tdev; + freebsd32_uint64_t ki_tdev; int ki_oncpu; int ki_lastcpu; int ki_tracer; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index e84eb1efbc2e..e6541c73ccac 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1439,7 +1439,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_sid); CP(*ki, *ki32, ki_tsid); CP(*ki, *ki32, ki_jobc); - CP(*ki, *ki32, ki_tdev); + FU64_CP(*ki, *ki32, ki_tdev); CP(*ki, *ki32, ki_tdev_freebsd11); CP(*ki, *ki32, ki_siglist); CP(*ki, *ki32, ki_sigmask); @@ -1466,7 +1466,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_slptime); CP(*ki, *ki32, ki_swtime); CP(*ki, *ki32, ki_cow); - CP(*ki, *ki32, ki_runtime); + FU64_CP(*ki, *ki32, ki_runtime); TV_CP(*ki, *ki32, ki_start); TV_CP(*ki, *ki32, ki_childtime); CP(*ki, *ki32, ki_flag);
