vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Discard several spurious differences from mainline

Browse source
This commit is contained in:
phcoder 2011-01-03 00:47:21 +01:00
parent 0a2b2cdc95
commit 5faa440cb0
3 changed files with 3 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
grub-core/kern/dl.c
View file

@ -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)

2
grub-core/kern/main.c
View file

@ -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 ();

4
include/grub/dl.h
View file

@ -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