dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch

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