From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 14:35:15 +0000 (+0200)
Subject: 	* kern/i386/coreboot/init.c (grub_machine_init): Call
X-Git-Tag: 1.99~922
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce60689c68559c5fd91f904319613eb075b95ff5;p=thirdparty%2Fgrub.git

	* kern/i386/coreboot/init.c (grub_machine_init): Call
	grub_machine_mmap_init on qemu.
---

diff --git a/ChangeLog b/ChangeLog
index eed00a623..8163ebe70 100644
--- 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 b945e623f..f7b837044 100644
--- 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);