ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
26 lines
706 B
Diff
26 lines
706 B
Diff
From fad5bdf5359d1f3e2ad962cc3fe0e15d26a3df6a Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 26 Jun 2017 12:44:59 -0400
|
|
Subject: [PATCH 188/206] 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 1f3ac5e1d08..2b60a6e27ea 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.15.0
|
|
|