* grub-core/kern/i386/coreboot/init.c: Fix compilation on

	i386-multiboot.

diff --git a/ChangeLog b/ChangeLog
index e114722fe03dd506798ca57bf8b4e32b50c4493f..04edc7138f93496c46adea3348d0442ede2681da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/i386/coreboot/init.c: Fix compilation on
+       i386-multiboot.
+
 2013-08-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/vga_init.c: Fix compilation on qemu-mips.

diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
index 9385411caa13498d14a975d4cffbf1d247da9fd0..777d7489c2f673c8be53c9b366ef1261cf06598d 100644 (file)
--- a/grub-core/kern/i386/coreboot/init.c
+++ b/grub-core/kern/i386/coreboot/init.c
@@ -85,6 +85,8 @@ heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
   return 0;
 }
 
+#ifndef GRUB_MACHINE_MULTIBOOT
+
 void
 grub_machine_init (void)
 {
@@ -94,9 +96,6 @@ grub_machine_init (void)
 
   grub_vga_text_init ();
 
-#ifdef GRUB_MACHINE_MULTIBOOT
-  grub_machine_mmap_init ();
-#endif
   grub_machine_mmap_iterate (heap_init, NULL);
 
   grub_video_coreboot_fb_late_init ();
@@ -107,6 +106,23 @@ grub_machine_init (void)
   grub_tsc_init ();
 }
 
+#else
+
+void
+grub_machine_init (void)
+{
+  modend = grub_modules_get_end ();
+
+  grub_vga_text_init ();
+
+  grub_machine_mmap_init ();
+  grub_machine_mmap_iterate (heap_init, NULL);
+
+  grub_tsc_init ();
+}
+
+#endif
+
 void
 grub_machine_get_bootlocation (char **device __attribute__ ((unused)),
                               char **path __attribute__ ((unused)))