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

Merge branch 'mainline' into snow64

Browse source
This commit is contained in:
phcoder 2009-09-02 18:17:06 +02:00
commit df2a15f643
12 changed files with 218 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

15
efiemu/loadcore.c
View file

@ -352,13 +352,18 @@ SUFFIX (grub_efiemu_loadcore_load) (void *core,
grub_efiemu_segment_t segments)
{
grub_err_t err;
if ((err = grub_efiemu_load_segments (segments, core)))
err = grub_efiemu_load_segments (segments, core);
if (err)
return err;
if ((err = grub_efiemu_resolve_symbols (segments, core)))
err = grub_efiemu_resolve_symbols (segments, core);
if (err)
return err;
if ((err = SUFFIX (grub_arch_efiemu_relocate_symbols) (segments,
grub_efiemu_elfsyms,
core)))
err = SUFFIX (grub_arch_efiemu_relocate_symbols) (segments,
grub_efiemu_elfsyms,
core);
if (err)
return err;
return GRUB_ERR_NONE;