Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-22 15:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge mainline into newreloc

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-05-01 16:38:58 +02:00
2 parents 6d971470fa ce60689c68
commit 32fa4348a3
2 files changed
+6 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2010-05-01 Vladimir Serbinenko <phcoder@gmail.com>
* kern/i386/coreboot/init.c (grub_machine_init): Call
grub_machine_mmap_init on qemu.
2010-05-01 Vladimir Serbinenko <phcoder@gmail.com> 2010-05-01 Vladimir Serbinenko <phcoder@gmail.com>
* boot/i386/qemu/boot.S: Add a missing .code16. * boot/i386/qemu/boot.S: Add a missing .code16.
kern/i386/coreboot/init.c
+1 -1
View File
@@ -102,7 +102,7 @@ grub_machine_init (void)
return 0; return 0;
} }
#ifdef GRUB_MACHINE_MULTIBOOT #if defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_QEMU)
grub_machine_mmap_init (); grub_machine_mmap_init ();
#endif #endif
grub_machine_mmap_iterate (heap_init); grub_machine_mmap_iterate (heap_init);