The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5d29ead2e2decba1940cda805ec9ceb06deb7f0f
commit 5d29ead2e2decba1940cda805ec9ceb06deb7f0f Author: Mateusz Guzik <[email protected]> AuthorDate: 2023-10-22 15:39:25 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2023-10-22 17:09:44 +0000 thread: reorder td_no_sleeping to plug two 4-byte holes on LP64 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/kern_thread.c | 2 +- sys/sys/proc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4175d1594af4..dcebb08956e6 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -87,7 +87,7 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x108, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0x114, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x4b8, +_Static_assert(offsetof(struct thread, td_frame) == 0x4b0, "struct thread KBI td_frame"); _Static_assert(offsetof(struct thread, td_emuldata) == 0x6c0, "struct thread KBI td_emuldata"); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 0b91b2a1a0b5..8c916173b4ef 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -314,8 +314,8 @@ struct thread { struct osd td_osd; /* (k) Object specific data. */ struct vm_map_entry *td_map_def_user; /* (k) Deferred entries. */ pid_t td_dbg_forked; /* (c) Child pid for debugger. */ - struct vnode *td_vp_reserved;/* (k) Preallocated vnode. */ u_int td_no_sleeping; /* (k) Sleeping disabled count. */ + struct vnode *td_vp_reserved;/* (k) Preallocated vnode. */ void *td_su; /* (k) FFS SU private */ sbintime_t td_sleeptimo; /* (t) Sleep timeout. */ int td_rtcgen; /* (s) rtc_generation of abs. sleep */
