grub2/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
Javier Martinez Canillas dc178ac546 Two more fixes for BLS support
- Use version field to sort BLS entries if id field isn't defined
 - Add version field to BLS fragments generated by 20-grub.install

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-11 10:13:07 -04:00

36 lines
1,017 B
Diff

From 2d7dabdbf322e8f679eeaefd48cb26b083cdeb1c 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 202/238] 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.17.0