2009-06-21  Robert Millan  <address@hidden>

	* kern/i386/coreboot/startup.S (grub_stop): Move from here ...
	* kern/i386/coreboot/init.c (grub_stop): ... to here.

Index: kern/i386/coreboot/startup.S
===================================================================
--- kern/i386/coreboot/startup.S	(revision 2353)
+++ kern/i386/coreboot/startup.S	(working copy)
@@ -78,14 +78,6 @@ codestart:
 	jmp EXT_C(grub_main)
 
 /*
- *  This call is special...  it never returns...  in fact it should simply
- *  hang at this point!
- */
-FUNCTION(grub_stop)
-	hlt
-	jmp EXT_C(grub_stop)
-
-/*
  *  prot_to_real and associated structures (but NOT real_to_prot, that is
  *  only needed for BIOS gates).
  */
Index: kern/i386/coreboot/init.c
===================================================================
--- kern/i386/coreboot/init.c	(revision 2353)
+++ kern/i386/coreboot/init.c	(working copy)
@@ -50,6 +50,17 @@ grub_get_rtc (void)
   grub_fatal ("grub_get_rtc() is not implemented.\n");
 }
 
+/*
+ *  This call is special...  it never returns...  in fact it should simply
+ *  hang at this point!
+ */
+void
+grub_stop ()
+{
+  while (1)
+    grub_cpu_idle ();
+}
+
 /* Stop the floppy drive from spinning, so that other software is
    jumped to with a known state.  */
 void