dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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