Merge tag 'efi-2019-07-rc5-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
authorTom Rini <trini@konsulko.com>
Sat, 29 Jun 2019 13:58:08 +0000 (09:58 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 29 Jun 2019 13:58:08 +0000 (09:58 -0400)
Pull request for UEFI sub-system for v2019.07-rc5 (4)

The definition of an unimplemented function is corrected.

include/efi_api.h

index 4de5d208f5999734834e9a0fa60ffbf9d84d8777..a36ececc81e441bfb8cd84f5e93ae817f3f29e97 100644 (file)
@@ -242,7 +242,8 @@ struct efi_runtime_services {
                        unsigned long descriptor_size,
                        uint32_t descriptor_version,
                        struct efi_mem_desc *virtmap);
-       efi_status_t (*convert_pointer)(unsigned long dbg, void **address);
+       efi_status_t (EFIAPI *convert_pointer)(
+                       efi_uintn_t debug_disposition, void **address);
        efi_status_t (EFIAPI *get_variable)(u16 *variable_name,
                                            const efi_guid_t *vendor,
                                            u32 *attributes,