svn commit: r235391 - head/sys/i386/include

[Andriy Gapon]

Author: avg
Date: Sun May 13 09:25:39 2012
New Revision: 235391
URL: http://svn.freebsd.org/changeset/base/235391

Log:
  i386 bootinfo: re-arrange EFI fields for natural alignment and packing
  
  Suggested by:	bde
  MFC after:	2 weeks

Modified:
  head/sys/i386/include/bootinfo.h

Modified: head/sys/i386/include/bootinfo.h
==============================================================================
--- head/sys/i386/include/bootinfo.h	Sun May 13 09:22:18 2012	(r235390)
+++ head/sys/i386/include/bootinfo.h	Sun May 13 09:25:39 2012	(r235391)
@@ -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