[PATCH] move grub_stop() (Re: [PATCH] i386-qemu port)

[Robert Millan <rmh@aybabtu.com>]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]


Move grub_stop to init.c to ease code sharing with i386-qemu.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

[-- Attachment #2: stop.diff --]
[-- Type: text/x-diff, Size: 1284 bytes --]

2009-06-21  Robert Millan  <rmh.grub@aybabtu.com>

	* 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