Changeset b9f1585 in mainline for boot/arch/ia64/src/main.c

Timestamp:

2019-01-03T06:53:22Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

043d464f

Parents:

b4a4ad94 (diff), 7acd787 (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 upstream changes

File:

• boot/arch/ia64/src/main.c (modified) (1 diff)

boot/arch/ia64/src/main.c

@@ -94 +94 @@
                     cur += md_size) {
                         efi_v1_memdesc_t *md = (efi_v1_memdesc_t *) cur;
+                        memmap_item_t *o = NULL;
+
+                        if (items)
+                                o = &memmap[items - 1];
 
                         switch ((efi_memory_type_t) md->type) {
+                        case EFI_LOADER_CODE:
+                        case EFI_LOADER_DATA:
+                        case EFI_BOOT_SERVICES_CODE:
+                        case EFI_BOOT_SERVICES_DATA:
                         case EFI_CONVENTIONAL_MEMORY:
+                                if (o && o->type == MEMMAP_FREE_MEM &&
+                                    o->base + o->size == md->phys_start) {
+                                        o->size += md->pages * EFI_PAGE_SIZE;
+                                        continue;
+                                }
                                 memmap[items].type = MEMMAP_FREE_MEM;
                                 break;