2009-10-28 Robert Millan <rmh.grub@aybabtu.com>

        * kern/i386/coreboot/init.c (grub_exit): Reimplement in a way that
        doesn't cause an infinite call loop.

diff --git a/ChangeLog b/ChangeLog
index 1a1be5746ad304457704e8c25c7957ffce4c0d4a..a792f04e5fef147e17b6641d28e4cff77bf3e105 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-28  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * kern/i386/coreboot/init.c (grub_exit): Reimplement in a way that
+       doesn't cause an infinite call loop.
+
 2009-10-28  Felix Zielcke  <fzielcke@z-51.de>
 
        * commands/acpi.c (grub_cmd_acpi): Fix the out of memory error

diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 1b9ca381549f6908962a5df1732f9a00710356ae..0bf4934fbf52e40ae4ee40ab5e67830704b0749a 100644 (file)
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -62,7 +62,10 @@ grub_stop_floppy (void)
 void
 grub_exit (void)
 {
-  grub_fatal ("grub_exit() is not implemented.\n");
+  /* We can't use grub_fatal() in this function.  This would create an infinite
+     loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
+  while (1)
+    grub_cpu_idle ();
 }
 
 void