81987f4958
- 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>
37 lines
1017 B
Diff
37 lines
1017 B
Diff
From 1706e90ed0c2634b6f06e97fa1c7057278a7096b Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Tue, 6 Feb 2018 11:02:09 +0100
|
|
Subject: [PATCH 203/206] Remove duplicated grub_exit() definition for grub-emu
|
|
platform
|
|
|
|
The grub_exit() function signature was changed on all platforms to take a
|
|
return code, but latter on a following commit the grub_exit() for the emu
|
|
platform was duplicated. It causes a build error so remove the duplicated
|
|
function definition.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
grub-core/kern/emu/main.c | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
|
|
index 7e47ec81263..55ea5a11ccd 100644
|
|
--- a/grub-core/kern/emu/main.c
|
|
+++ b/grub-core/kern/emu/main.c
|
|
@@ -72,12 +72,6 @@ grub_exit (int retval __attribute__((unused)))
|
|
grub_reboot ();
|
|
}
|
|
|
|
-void
|
|
-grub_exit (int retval __attribute__((unused)))
|
|
-{
|
|
- grub_reboot ();
|
|
-}
|
|
-
|
|
void
|
|
grub_machine_init (void)
|
|
{
|
|
--
|
|
2.15.0
|
|
|