* kern/i386/coreboot/init.c (grub_machine_init): Call

	grub_machine_mmap_init on qemu.

diff --git a/ChangeLog b/ChangeLog
index eed00a623d5ea0e57a915381d7202303f0ad6825..8163ebe700d53cd799ee9b1a583f70d8fbd58ab5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * boot/i386/qemu/boot.S: Add a missing .code16.

diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index b945e623fde121e392d52c728e3d34139c0e427d..f7b837044eec847031645be0e01f2d3e67c19417 100644 (file)
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -117,7 +117,7 @@ grub_machine_init (void)
     return 0;
   }
 
-#ifdef GRUB_MACHINE_MULTIBOOT
+#if defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_QEMU)
   grub_machine_mmap_init ();
 #endif
   grub_machine_mmap_iterate (heap_init);