grub2/0189-don-t-use-int-for-efi-status.patch
Peter Jones b8119d9104 Fix a mismerge that makes arm not boot.
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:35:26 -04:00

26 lines
702 B
Diff

From 6711c5bb2641789ac5e24bf880283eef65532518 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 26 Jun 2017 12:44:59 -0400
Subject: [PATCH 189/192] don't use int for efi status
---
grub-core/kern/efi/efi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 1f3ac5e1d..2b60a6e27 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -157,7 +157,7 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
void
grub_exit (int retval)
{
- int rc = GRUB_EFI_LOAD_ERROR;
+ grub_efi_status_t rc = GRUB_EFI_LOAD_ERROR;
if (retval == 0)
rc = GRUB_EFI_SUCCESS;
--
2.13.4