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

* loader/multiboot.c (grub_multiboot_boot) [GRUB_USE_MULTIBOOT2]:

Browse source 
Properly align mbi.
	Reported by: Seth Goldberg.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-02 00:40:37 +02:00
parent b0c4f95642
commit 48f27e87fc
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-07-02 Vladimir Serbinenko <phcoder@gmail.com>
* loader/multiboot.c (grub_multiboot_boot) [GRUB_USE_MULTIBOOT2]:
Properly align mbi.
Reported by: Seth Goldberg.
2010-07-01 Vladimir Serbinenko <phcoder@gmail.com> 2010-07-01 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkrescue.in: Avoid module duplication. * util/grub-mkrescue.in: Avoid module duplication.

6
loader/multiboot.c
View file

@ -136,8 +136,14 @@ grub_multiboot_boot (void)
grub_multiboot_alloc_mbi = mbi_size; grub_multiboot_alloc_mbi = mbi_size;
} }
#ifdef GRUB_USE_MULTIBOOT2
state.MULTIBOOT_MBI_REGISTER = ALIGN_UP (grub_multiboot_payload_dest
+ grub_multiboot_pure_size,
MULTIBOOT_TAG_ALIGN);
#else
state.MULTIBOOT_MBI_REGISTER = grub_multiboot_payload_dest state.MULTIBOOT_MBI_REGISTER = grub_multiboot_payload_dest
+ grub_multiboot_pure_size; + grub_multiboot_pure_size;
#endif
err = grub_multiboot_make_mbi (grub_multiboot_payload_orig, err = grub_multiboot_make_mbi (grub_multiboot_payload_orig,
grub_multiboot_payload_dest, grub_multiboot_payload_dest,
grub_multiboot_pure_size, mbi_size); grub_multiboot_pure_size, mbi_size);