Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 887c4cf

Browse files
keesardbiesheuvel
authored andcommitted
efi: Rename efi_early_memdesc_ptr() to efi_memdesc_ptr()
The "early" part of the helper's name isn't accurate[1]. Drop it in preparation for adding a new (not early) usage. Suggested-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/lkml/CAMj1kXEyDjH0uu3Z4eBesV3PEnKGi5ArXXMp7R-hn8HdRytiPg@mail.gmail.com [1] Signed-off-by: Kees Cook <kees@kernel.org> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
1 parent 12a01f6 commit 887c4cf

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

drivers/firmware/efi/libstub/relocate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
4848
unsigned long m = (unsigned long)map->map;
4949
u64 start, end;
5050

51-
desc = efi_early_memdesc_ptr(m, map->desc_size, i);
51+
desc = efi_memdesc_ptr(m, map->desc_size, i);
5252

5353
if (desc->type != EFI_CONVENTIONAL_MEMORY)
5454
continue;

drivers/firmware/efi/libstub/unaccepted_memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ efi_status_t allocate_unaccepted_bitmap(__u32 nr_desc,
2929
efi_memory_desc_t *d;
3030
unsigned long m = (unsigned long)map->map;
3131

32-
d = efi_early_memdesc_ptr(m, map->desc_size, i);
32+
d = efi_memdesc_ptr(m, map->desc_size, i);
3333
if (d->type != EFI_UNACCEPTED_MEMORY)
3434
continue;
3535

drivers/firmware/efi/libstub/x86-stub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_s
614614
m |= (u64)efi->efi_memmap_hi << 32;
615615
#endif
616616

617-
d = efi_early_memdesc_ptr(m, efi->efi_memdesc_size, i);
617+
d = efi_memdesc_ptr(m, efi->efi_memdesc_size, i);
618618
switch (d->type) {
619619
case EFI_RESERVED_TYPE:
620620
case EFI_RUNTIME_SERVICES_CODE:

include/linux/efi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
784784
efi_memattr_perm_setter fn);
785785

786786
/*
787-
* efi_early_memdesc_ptr - get the n-th EFI memmap descriptor
787+
* efi_memdesc_ptr - get the n-th EFI memmap descriptor
788788
* @map: the start of efi memmap
789789
* @desc_size: the size of space for each EFI memmap descriptor
790790
* @n: the index of efi memmap descriptor
@@ -802,7 +802,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
802802
* during bootup since for_each_efi_memory_desc_xxx() is available after the
803803
* kernel initializes the EFI subsystem to set up struct efi_memory_map.
804804
*/
805-
#define efi_early_memdesc_ptr(map, desc_size, n) \
805+
#define efi_memdesc_ptr(map, desc_size, n) \
806806
(efi_memory_desc_t *)((void *)(map) + ((n) * (desc_size)))
807807

808808
/* Iterate through an efi_memory_map */

0 commit comments

Comments
 (0)