Discard several spurious differences from mainline

diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 7727745e8b2b17d881e57b508ca0aaf3781baddf..787fcfad0563e4e2b20464c559fc333043c04cd3 100644 (file)
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -611,31 +611,6 @@ grub_dl_load_core (void *addr, grub_size_t size)
   return mod;
 }
 
-#ifdef __ia64__
-void
-grub_init_module (const char *name,
-                 void (*init)(grub_dl_t), void (*fini)(void))
-{
-  grub_dl_t mod;
-
-  mod = (grub_dl_t) grub_malloc (sizeof (*mod));
-  if (! mod)
-    return;
-
-  mod->name = (char *) name;
-  mod->ref_count = 1;
-  mod->dep = 0;
-  mod->segment = 0;
-  mod->init = init;
-  mod->fini = fini;
-
-  grub_dl_call_init (mod);
-
-  /* Can't fail.  */
-  grub_dl_add (mod);
-}
-#endif
-
 /* Load a module from the file FILENAME.  */
 grub_dl_t
 grub_dl_load_file (const char *filename)

diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
index 24593e3c0c77b4f51a4e5bdbb6ef75811378ec4a..3474ed3bbfcce07d388f428a96cea8bc48b9fc55 100644 (file)
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -159,7 +159,7 @@ static void
 grub_load_normal_mode (void)
 {
   /* Load the module.  */
-//  grub_dl_load ("normal");
+  grub_dl_load ("normal");
 
   /* Something went wrong.  Print errors here to let user know why we're entering rescue mode.  */
   grub_print_error ();

diff --git a/include/grub/dl.h b/include/grub/dl.h
index fcf5bb620dfd06078cf20c54404ba11d9d5d26d5..a5e5c333293aea0dec184c9ca179ee8ae86ca2ff 100644 (file)
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -34,9 +34,9 @@
 #ifndef GRUB_MOD_INIT
 #define GRUB_MOD_INIT(name)    \
 static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
-void grub_##name##_init (grub_dl_t); \
+void grub_##name##_init (void); \
 void \
-grub_##name##_init (grub_dl_t mod) { grub_mod_init (mod); } \
+grub_##name##_init (void) { grub_mod_init (0); } \
 static void \
 grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
 #endif