The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=78aeba26e8d05c251ea2fb2b168006e9612cfe31
commit 78aeba26e8d05c251ea2fb2b168006e9612cfe31 Author: Andrew Turner <and...@freebsd.org> AuthorDate: 2022-09-26 14:41:40 +0000 Commit: Andrew Turner <and...@freebsd.org> CommitDate: 2022-09-27 13:47:30 +0000 Reorder pmap_bootstrap_state to reduce holes Reduce holes in pmap_bootstrap_state by moving freemempos after the pointers as they are more likely to change size in any future ABI. Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/pmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index ba2e3cc3392f..dce52034f27c 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -818,16 +818,16 @@ pmap_early_vtophys(vm_offset_t va) /* State of the bootstrapped DMAP page tables */ struct pmap_bootstrap_state { - vm_offset_t va; - vm_paddr_t pa; pt_entry_t *l1; pt_entry_t *l2; pt_entry_t *l3; + vm_offset_t freemempos; + vm_offset_t va; + vm_paddr_t pa; pt_entry_t table_attrs; u_int l0_slot; u_int l1_slot; u_int l2_slot; - vm_offset_t freemempos; bool dmap_valid; };