diff options
| author | Heinrich Schuchardt | 2021-08-17 15:02:23 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt | 2021-08-17 17:24:08 +0200 |
| commit | c91737b7f1a5180b8944eea2121347ef6429b17c (patch) | |
| tree | da06d72cfa38a1a41275f0a32d203dc6d0395aaa | |
| parent | 3ced574530e13b12cec3dc9ef87f1a175fb76c83 (diff) | |
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>
| -rw-r--r-- | arch/x86/include/asm/hob.h | 2 | ||||
| -rw-r--r-- | include/efi.h | 2 | ||||
| -rw-r--r-- | include/efi_api.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/hob.h b/arch/x86/include/asm/hob.h index 56e11dbb28f..2f5b6e24c29 100644 --- 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 4eb573a2806..18c13e0370a 100644 --- 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 38ac47f1646..c8f959bb720 100644 --- 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; |