aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/boot/compressed/eboot.c
diff options
context:
space:
mode:
authorRoy Franz <roy.franz@linaro.org>2013-09-22 15:45:37 -0700
committerMatt Fleming <matt.fleming@intel.com>2013-09-25 12:34:41 +0100
commitae8e9060a3ecfd22bd5059e39f81547613ae376c (patch)
tree02917afa6c64b5d1af31743265036e8a7280be9a /arch/x86/boot/compressed/eboot.c
parent1c089c65f54b70261fdcb4c238986a979c11fad7 (diff)
downloadlinux-linaro-stable-ae8e9060a3ecfd22bd5059e39f81547613ae376c.tar.gz
efi: use efi_get_memory_map() to get final map for x86
Replace the open-coded memory map getting with the efi_get_memory_map() that is now general enough to use. Signed-off-by: Roy Franz <roy.franz@linaro.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/boot/compressed/eboot.c')
-rw-r--r--arch/x86/boot/compressed/eboot.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 5e708c0d466f..bf2c35d5ec1f 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -527,25 +527,12 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
u8 nr_entries;
int i;
- size = sizeof(*mem_map) * 32;
-
-again:
- size += sizeof(*mem_map) * 2;
- _size = size;
- status = efi_low_alloc(sys_table, size, 1, (unsigned long *)&mem_map);
- if (status != EFI_SUCCESS)
- return status;
-
get_map:
- status = efi_call_phys5(sys_table->boottime->get_memory_map, &size,
- mem_map, &key, &desc_size, &desc_version);
- if (status == EFI_BUFFER_TOO_SMALL) {
- efi_free(sys_table, _size, (unsigned long)mem_map);
- goto again;
- }
+ status = efi_get_memory_map(sys_table, &mem_map, &size, &desc_size,
+ &desc_version, &key);
if (status != EFI_SUCCESS)
- goto free_mem_map;
+ return status;
memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));
efi->efi_systab = (unsigned long)sys_table;
@@ -574,6 +561,7 @@ get_map:
goto free_mem_map;
called_exit = true;
+ efi_call_phys1(sys_table->boottime->free_pool, mem_map);
goto get_map;
}
@@ -642,7 +630,7 @@ get_map:
return EFI_SUCCESS;
free_mem_map:
- efi_free(sys_table, _size, (unsigned long)mem_map);
+ efi_call_phys1(sys_table->boottime->free_pool, mem_map);
return status;
}