The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=838fcf30d7b862ac3d15bcda370f74fc69d63dcb
commit 838fcf30d7b862ac3d15bcda370f74fc69d63dcb Author: Konstantin Belousov <[email protected]> AuthorDate: 2026-02-05 19:35:01 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2026-02-21 21:34:07 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct ffclock_estimate32 (cherry picked from commit 3dc72107d29d304ba21f04426ec82077d23cedcd) --- sys/compat/freebsd32/freebsd32.h | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 7dc1c5d2302c..78eb34694f7d 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -59,7 +59,7 @@ struct ffclock_estimate32 { struct bintime32 update_time; ffcounter update_ffcount; ffcounter leapsec_next; - uint64_t period; + freebsd32_uint64_t period; uint32_t errb_abs; uint32_t errb_rate; uint32_t status; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 25a8558335e7..7a624b45cbf7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4149,7 +4149,7 @@ freebsd32_ffclock_setestimate(struct thread *td, memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t)); CP(cest, cest32, update_ffcount); CP(cest, cest32, leapsec_next); - CP(cest, cest32, period); + FU64_CP(cest, cest32, period); CP(cest, cest32, errb_abs); CP(cest, cest32, errb_rate); CP(cest, cest32, status); @@ -4179,7 +4179,7 @@ freebsd32_ffclock_getestimate(struct thread *td, memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t)); CP(cest32, cest, update_ffcount); CP(cest32, cest, leapsec_next); - CP(cest32, cest, period); + FU64_CP(cest32, cest, period); CP(cest32, cest, errb_abs); CP(cest32, cest, errb_rate); CP(cest32, cest, status);
