Changeset bc73be3 in mainline for kernel/genarch/src/multiboot/multiboot2.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/genarch/src/multiboot/multiboot2.c (modified) (1 diff)

kernel/genarch/src/multiboot/multiboot2.c

@@ -65 +65 @@
         multiboot2_memmap_entry_t *entry = (multiboot2_memmap_entry_t *)
             ((uintptr_t) memmap + sizeof(*memmap));
-        uint32_t pos = sizeof(*memmap);
+        uint32_t pos = offsetof(multiboot2_tag_t, memmap) + sizeof(*memmap);
 
         while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) {