]> git.proxmox.com Git - efi-boot-shim.git/commitdiff
Don't name something exit().
authorPeter Jones <pjones@redhat.com>
Wed, 27 Aug 2014 20:40:57 +0000 (16:40 -0400)
committerPeter Jones <pjones@redhat.com>
Wed, 27 Aug 2014 20:40:57 +0000 (16:40 -0400)
On aarch64 due to some terrifying include chain we wind up with
Cryptlib's definition of exit here.  I'm not a glutton for punishment,
so I'm just changing the name so it's not coliding.

Signed-off-by: Peter Jones <pjones@redhat.com>
replacements.c

index 5dfa3556718453b18b505d0c156c7b35626a2cde..f7623d9db853a28fdd697f7d92a7e4885bff4be8 100644 (file)
@@ -162,7 +162,7 @@ exit_boot_services(EFI_HANDLE image_key, UINTN map_key)
 }
 
 static EFI_STATUS EFIAPI
-exit(EFI_HANDLE ImageHandle, EFI_STATUS ExitStatus,
+do_exit(EFI_HANDLE ImageHandle, EFI_STATUS ExitStatus,
      UINTN ExitDataSize, CHAR16 *ExitData)
 {
        EFI_STATUS status;
@@ -206,5 +206,5 @@ hook_system_services(EFI_SYSTEM_TABLE *local_systab)
         * bootloader and still e.g. start a new one or run an internal
         * shell. */
        system_exit = systab->BootServices->Exit;
-       systab->BootServices->Exit = exit;
+       systab->BootServices->Exit = do_exit;
 }