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

Merge mainline into newreloc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-17 19:18:46 +01:00
commit 88d2919b7d
30 changed files with 213 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

1
loader/i386/bsd.c
View file

@ -807,6 +807,7 @@ grub_openbsd_boot (void)
pa = pa->ba_next;
pa->ba_type = OPENBSD_BOOTARG_END;
pa++;
buf = (grub_uint8_t *) pa;
argbuf_target_end = buf - buf0 + buf_target;

1
loader/i386/multiboot_mbi.c
View file

@ -239,6 +239,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
grub_size_t mmap_size;
grub_uint8_t *ptrorig;
grub_addr_t ptrdest;
grub_err_t err;
grub_size_t bufsize;

1
loader/i386/pc/linux.c
View file

@ -64,7 +64,6 @@ grub_linux16_boot (void)
return grub_relocator16_boot (relocator, state);
}
static grub_err_t
grub_linux_unload (void)
{