diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-21 14:25:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-21 14:25:37 -0400 |
| commit | 751b18b8a1b576aecf51faf22c2bb9e7ce70debd (patch) | |
| tree | 9339296afd74657deb93955cf5b187f9194d7b5d /lib/efi_loader/efi_memory.c | |
| parent | 3bacb5ee76eadc97c0606e1b408604d20db9a97d (diff) | |
| parent | ba2a0cbb053951ed6d36161989d38da724696b4d (diff) | |
Merge branch 'master' into next
Merge in v2020.10-rc5
Diffstat (limited to 'lib/efi_loader/efi_memory.c')
| -rw-r--r-- | lib/efi_loader/efi_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 7be756e370d..11e755363e4 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -235,7 +235,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map, * @start: start address, must be a multiple of EFI_PAGE_SIZE * @pages: number of pages to add * @memory_type: type of memory added - * @overlap_only_ram: the memory area must overlap existing + * @overlap_only_ram: region may only overlap RAM * Return: status code */ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, |