From b015ab57bf558daa1c768995a7a7f1df2d40191e Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 5 May 2019 21:58:35 +0200 Subject: [PATCH] efi_loader: signature of ExitBootServices() Consistently use efi_uintn_t as type of memory keys. Signed-off-by: Heinrich Schuchardt Reviewed-by: Alexander Graf --- include/efi_api.h | 3 ++- lib/efi_loader/efi_boottime.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h index b2ae279747..755c405793 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -128,7 +128,8 @@ struct efi_boot_services { efi_status_t exit_status, efi_uintn_t exitdata_size, u16 *exitdata); efi_status_t (EFIAPI *unload_image)(efi_handle_t image_handle); - efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t, unsigned long); + efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t image_handle, + efi_uintn_t map_key); efi_status_t (EFIAPI *get_next_monotonic_count)(u64 *count); efi_status_t (EFIAPI *stall)(unsigned long usecs); diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 89966a2f12..b97d55cb45 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1841,11 +1841,11 @@ static void efi_exit_caches(void) * Return: status code */ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, - unsigned long map_key) + efi_uintn_t map_key) { struct efi_event *evt; - EFI_ENTRY("%p, %ld", image_handle, map_key); + EFI_ENTRY("%p, %zx", image_handle, map_key); /* Check that the caller has read the current memory map */ if (map_key != efi_memory_map_key) -- 2.25.1