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

2009-07-01 Pavel Roskin <proski@gnu.org>

Browse source 
* util/misc.c: Move grub_reboot() and grub_halt() ...
	* util/grub-emu.c: ... here.  Make main_env static.
	* include/grub/util/misc.h: Remove main_env.
This commit is contained in:
proski 2009-07-01 15:59:05 +00:00
parent 2ef0084d80
commit 1b96e95249
4 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2009-07-01 Pavel Roskin <proski@gnu.org> 2009-07-01 Pavel Roskin <proski@gnu.org>
* util/misc.c: Move grub_reboot() and grub_halt() ...
* util/grub-emu.c: ... here. Make main_env static.
* include/grub/util/misc.h: Remove main_env.
* kern/mm.c: Use correct format to print size_t. * kern/mm.c: Use correct format to print size_t.
* include/grub/elf.h: Define Elf_Sword and Elf_Xword. * include/grub/elf.h: Define Elf_Sword and Elf_Xword.

1
include/grub/util/misc.h
View file

@ -38,7 +38,6 @@
extern char *progname; extern char *progname;
extern int verbosity; extern int verbosity;
extern jmp_buf main_env;
void grub_util_warn (const char *fmt, ...); void grub_util_warn (const char *fmt, ...);
void grub_util_info (const char *fmt, ...); void grub_util_info (const char *fmt, ...);

18
util/grub-emu.c
View file

@ -40,7 +40,7 @@
#include <grub_emu_init.h> #include <grub_emu_init.h>
/* Used for going back to the main function. */ /* Used for going back to the main function. */
jmp_buf main_env; static jmp_buf main_env;
/* Store the prefix specified by an argument. */ /* Store the prefix specified by an argument. */
static char *prefix = 0; static char *prefix = 0;
@ -68,6 +68,22 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
return GRUB_ERR_BAD_MODULE; return GRUB_ERR_BAD_MODULE;
} }
void
grub_reboot (void)
{
longjmp (main_env, 1);
}
void
grub_halt (
#ifdef GRUB_MACHINE_PCBIOS
int no_apm __attribute__ ((unused))
#endif
)
{
grub_reboot ();
}
void void
grub_machine_init (void) grub_machine_init (void)
{ {

16
util/misc.c
View file

@ -439,19 +439,3 @@ fail:
} }
#endif /* __MINGW32__ */ #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 ();
}