2 files changed, 7 insertions, 9 deletions

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index a850cbc48d8d..c49d50e68aee 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -174,6 +174,7 @@ static __init void reserve_regions(void)
 {
         efi_memory_desc_t *md;
         u64 paddr, npages, size;
+        int resv;
 
         if (efi_enabled(EFI_DBG))
                 pr_info("Processing EFI memory map:\n");
@@ -190,12 +191,14 @@ static __init void reserve_regions(void)
                 paddr = md->phys_addr;
                 npages = md->num_pages;
 
+                resv = is_reserve_region(md);
                 if (efi_enabled(EFI_DBG)) {
                         char buf[64];
 
-                        pr_info("  0x%012llx-0x%012llx %s",
+                        pr_info("  0x%012llx-0x%012llx %s%s\n",
                                 paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
-                                efi_md_typeattr_format(buf, sizeof(buf), md));
+                                efi_md_typeattr_format(buf, sizeof(buf), md),
+                                resv ? "*" : "");
                 }
 
                 memrange_efi_to_native(&paddr, &npages);
@@ -204,14 +207,9 @@ static __init void reserve_regions(void)
                 if (is_normal_ram(md))
                         early_init_dt_add_memory_arch(paddr, size);
 
-                if (is_reserve_region(md)) {
+                if (resv)
                         memblock_mark_nomap(paddr, size);
-                        if (efi_enabled(EFI_DBG))
-                                pr_cont("*");
-                }
 
-                if (efi_enabled(EFI_DBG))
-                        pr_cont("\n");
         }
 
         set_bit(EFI_MEMMAP, &efi.flags);
diff --git a/include/linux/efi.h b/include/linux/efi.h
index c2db3ca22217..f196dd0b0f2f 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1005,7 +1005,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
 /* Iterate through an efi_memory_map */
 #define for_each_efi_memory_desc_in_map(m, md)                             \
         for ((md) = (m)->map;                                              \
-             (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+             ((void *)(md) + (m)->desc_size) <= (m)->map_end;              \
              (md) = (void *)(md) + (m)->desc_size)
 
 /**