vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-07-01 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* util/misc.c: Include `<setjmp.h>' and `<grub/machine/machine.h>'.
        (grub_reboot, grub_halt): New functions.

        * util/i386/pc/misc.c: Delete.  Update all users.
        * util/sparc64/ieee1275/misc.c: Likewise.
        * util/powerpc/ieee1275/misc.c: Likewise.
This commit is contained in:
robertmh 2009-07-01 13:01:33 +00:00
parent aaf53e3ce3
commit 211d06b54b
12 changed files with 27 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

18
util/misc.c
View file

@ -18,6 +18,7 @@
#include <config.h>
#include <setjmp.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@ -36,6 +37,7 @@
#include <grub/term.h>
#include <grub/time.h>
#include <grub/machine/time.h>
#include <grub/machine/machine.h>
/* Include malloc.h, only if memalign is available. It is known that
memalign is declared in malloc.h in all systems, if present. */
@ -436,4 +438,20 @@ fail:
return size;
}
#endif /* __MINGW32__ */
void
grub_reboot (void)
{
longjmp (main_env, 1);
}
void
grub_halt (
#ifdef GRUB_MACHINE_PCBIOS
int no_apm __attribute__ ((unused))
#endif
)
{
grub_reboot ();
}