Changeset 0dc2fec in mainline for kernel/arch/ia32/include/arch/boot/memmap.h

Timestamp:

2016-05-22T19:19:43Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/ia32/include/arch/boot/memmap.h (modified) (2 diffs)

kernel/arch/ia32/include/arch/boot/memmap.h

@@ -36 +36 @@
 #define KERN_ia32_MEMMAP_H_
 
+#include <arch/boot/memmap_struct.h>
+
 /* E820h memory range types */
 
@@ -63 +65 @@
 #include <typedefs.h>
 
-typedef struct {
-        uint64_t base_address;
-        uint64_t size;
-        uint32_t type;
-} __attribute__ ((packed)) e820memmap_t;
-
 extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
 extern uint8_t e820counter;