Re: [patch] PPC build fixes

[Hollis Blanchard]

On Feb 20, 2005, at 7:39 AM, Yoshinori K. Okuji wrote:

> On Sunday 20 February 2005 00:34, Hollis Blanchard wrote:
> > - grub_reboot and grub_halt in util/i386/pc/misc.c are not
> >   architecture-specific, so have been moved to util/grub-emu.c.
>
> grub_halt is clearly arch-specific. Look at the definition grub_halt in
> PC. It takes one argument, while the PPC version does not. I expect
> that the same thing might happen in grub_reboot as well.

Oops, I meant to convert that into using a more generic "flags" 
argument, and then "no_apm" becomes one bit in it. How would that be?

--- util/grub-emu.c     15 Feb 2005 00:07:01 -0000      1.15
+++ util/grub-emu.c     20 Feb 2005 16:36:49 -0000
@@ -73,6 +73,18 @@ grub_arch_dl_relocate_symbols (grub_dl_t
 }

 void
+grub_reboot (void)
+{
+  longjmp (main_env, 1);
+}
+
+void
+grub_halt (grub_uint32_t flags __attribute__ ((unused)))
+{
+  grub_reboot ();
+}
+
+void
 grub_machine_init (void)
 {
   signal (SIGINT, SIG_IGN);

-Hollis