efi_loader rename enum efi_mem_type to efi_memory_type

Use the same name as in the UEFI specification to avoid confusion.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/arch/x86/include/asm/hob.h b/arch/x86/include/asm/hob.h
index 56e11dbb28f02aab661cfd7a634d9cf3565b263c..2f5b6e24c29f70d4de1ba7337f6509731b4ce9a3 100644 (file)
--- a/arch/x86/include/asm/hob.h
+++ b/arch/x86/include/asm/hob.h
@@ -91,7 +91,7 @@ struct hob_mem_alloc {
         * Type EFI_MEMORY_TYPE is defined in AllocatePages() in the UEFI 2.0
         * specification.
         */
-       enum efi_mem_type       mem_type;
+       enum efi_memory_type    mem_type;
        /* padding */
        u8                      reserved[4];
 };

diff --git a/include/efi.h b/include/efi.h
index 4eb573a28068b5b5dcadf718726114dd514fab7a..18c13e0370a37a59070e327e1bf0fc8755387bf4 100644 (file)
--- a/include/efi.h
+++ b/include/efi.h
@@ -154,7 +154,7 @@ enum efi_allocate_type {
 };
 
 /* Enumeration of memory types introduced in UEFI */
-enum efi_mem_type {
+enum efi_memory_type {
        EFI_RESERVED_MEMORY_TYPE,
        /*
         * The code portions of a loaded application.

diff --git a/include/efi_api.h b/include/efi_api.h
index 38ac47f164639a6db9034c1d661aff6578ae659d..c8f959bb720d7cfbc56a4cc1dc52cb1c884d6c07 100644 (file)
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -249,7 +249,7 @@ struct efi_memory_range {
 struct efi_memory_range_capsule {
        struct efi_capsule_header *header;
        /* EFI_MEMORY_TYPE: 0x80000000-0xFFFFFFFF */
-       enum efi_mem_type os_requested_memory_type;
+       enum efi_memory_type os_requested_memory_type;
        u64 number_of_memory_ranges;
        struct efi_memory_range memory_ranges[];
 } __packed;