From ff342bdca6101c8d81d6f50abd7d0955503ff861 Mon Sep 17 00:00:00 2001 From: avg Date: Sat, 2 Jun 2012 18:36:29 +0000 Subject: [PATCH] MFC r235391: i386 bootinfo: re-arrange EFI fields for natural alignment and packing git-svn-id: svn://svn.freebsd.org/base/stable/9@236464 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/i386/include/bootinfo.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h index 9c36e2827..ef595d5f5 100644 --- a/sys/i386/include/bootinfo.h +++ b/sys/i386/include/bootinfo.h @@ -65,13 +65,13 @@ struct bootinfo { u_int32_t bi_kernend; /* end of kernel space */ u_int32_t bi_envp; /* environment */ u_int32_t bi_modulep; /* preloaded modules */ + uint32_t bi_memdesc_version; /* EFI memory desc version */ + uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ + uint64_t bi_memmap; /* pa of EFI memory map */ + uint64_t bi_memmap_size; /* size of EFI memory map */ uint64_t bi_hcdp; /* DIG64 HCDP table */ uint64_t bi_fpswa; /* FPSWA interface */ uint64_t bi_systab; /* pa of EFI system table */ - uint64_t bi_memmap; /* pa of EFI memory map */ - uint64_t bi_memmap_size; /* size of EFI memory map */ - uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ - uint32_t bi_memdesc_version; /* EFI memory desc version */ }; #ifdef _KERNEL -- 2.45.0