grub2/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
Peter Jones b8119d9104 Fix a mismerge that makes arm not boot.
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:35:26 -04:00

33 lines
1001 B
Diff

From a80182d86a6a55413b5794a2eca80b4b7dfc9be5 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 26 Jun 2017 12:46:23 -0400
Subject: [PATCH 190/192] make GRUB_MOD_INIT() declare its function prototypes.
---
include/grub/dl.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 2bca56ce0..b1ed3c333 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -54,6 +54,7 @@ grub_mod_fini (void)
#define GRUB_MOD_INIT(name) \
static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
+extern void grub_##name##_init (void); \
void \
grub_##name##_init (void) { grub_mod_init (0); } \
static void \
@@ -61,6 +62,7 @@ grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
#define GRUB_MOD_FINI(name) \
static void grub_mod_fini (void) __attribute__ ((used)); \
+extern void grub_##name##_fini (void); \
void \
grub_##name##_fini (void) { grub_mod_fini (); } \
static void \
--
2.13.4