|
 |
e97c83 |
From 32f10548cdf1919103654ab65601c8b15c3976a1 Mon Sep 17 00:00:00 2001
|
|
|
e97c83 |
From: Peter Jones <pjones@redhat.com>
|
|
|
e97c83 |
Date: Wed, 27 Aug 2014 13:26:23 -0400
|
|
|
e97c83 |
Subject: [PATCH 53/74] Don't name something exit().
|
|
|
e97c83 |
|
|
|
e97c83 |
On aarch64 due to some terrifying include chain we wind up with
|
|
|
e97c83 |
Cryptlib's definition of exit here. I'm not a glutton for punishment,
|
|
|
e97c83 |
so I'm just changing the name so it's not coliding.
|
|
|
e97c83 |
|
|
|
e97c83 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
e97c83 |
---
|
|
|
e97c83 |
replacements.c | 4 ++--
|
|
|
e97c83 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
e97c83 |
|
|
|
e97c83 |
diff --git a/replacements.c b/replacements.c
|
|
|
e97c83 |
index 5dfa355..f7623d9 100644
|
|
|
e97c83 |
--- a/replacements.c
|
|
|
e97c83 |
+++ b/replacements.c
|
|
|
e97c83 |
@@ -162,7 +162,7 @@ exit_boot_services(EFI_HANDLE image_key, UINTN map_key)
|
|
|
e97c83 |
}
|
|
|
e97c83 |
|
|
|
e97c83 |
static EFI_STATUS EFIAPI
|
|
|
e97c83 |
-exit(EFI_HANDLE ImageHandle, EFI_STATUS ExitStatus,
|
|
|
e97c83 |
+do_exit(EFI_HANDLE ImageHandle, EFI_STATUS ExitStatus,
|
|
|
e97c83 |
UINTN ExitDataSize, CHAR16 *ExitData)
|
|
|
e97c83 |
{
|
|
|
e97c83 |
EFI_STATUS status;
|
|
|
e97c83 |
@@ -206,5 +206,5 @@ hook_system_services(EFI_SYSTEM_TABLE *local_systab)
|
|
|
e97c83 |
* bootloader and still e.g. start a new one or run an internal
|
|
|
e97c83 |
* shell. */
|
|
|
e97c83 |
system_exit = systab->BootServices->Exit;
|
|
|
e97c83 |
- systab->BootServices->Exit = exit;
|
|
|
e97c83 |
+ systab->BootServices->Exit = do_exit;
|
|
|
e97c83 |
}
|
|
|
e97c83 |
--
|
|
|
e97c83 |
1.9.3
|
|
|
e97c83 |
|