1 files changed, 6 insertions, 20 deletions

diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index 8f5db4a3c9d9..865fdf5c7344 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -120,23 +120,6 @@ out:
         return retval;
 }
 
-static __initdata char memory_type_name[][32] = {
-        {"Reserved"},
-        {"Loader Code"},
-        {"Loader Data"},
-        {"Boot Code"},
-        {"Boot Data"},
-        {"Runtime Code"},
-        {"Runtime Data"},
-        {"Conventional Memory"},
-        {"Unusable Memory"},
-        {"ACPI Reclaim Memory"},
-        {"ACPI Memory NVS"},
-        {"Memory Mapped I/O"},
-        {"MMIO Port Space"},
-        {"PAL Code"},
-};
-
 /*
  * Return true for RAM regions we want to permanently reserve.
  */
@@ -167,10 +150,13 @@ static __init void reserve_regions(void)
                 paddr = md->phys_addr;
                 npages = md->num_pages;
 
-                if (uefi_debug)
-                        pr_info("  0x%012llx-0x%012llx [%s]",
+                if (uefi_debug) {
+                        char buf[64];
+
+                        pr_info("  0x%012llx-0x%012llx %s",
                                 paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
-                                memory_type_name[md->type]);
+                                efi_md_typeattr_format(buf, sizeof(buf), md));
+                }
 
                 memrange_efi_to_native(&paddr, &npages);
                 size = npages << PAGE_SHIFT;