From 1b96e952494e36b91b4e927001a96fae9c0c60e5 Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Wed, 1 Jul 2009 15:59:05 +0000
Subject: [PATCH] 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.
---
 ChangeLog                |  4 ++++
 include/grub/util/misc.h |  1 -
 util/grub-emu.c          | 18 +++++++++++++++++-
 util/misc.c              | 16 ----------------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38d3a8a98..d1772af1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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.
 
 	* include/grub/elf.h: Define Elf_Sword and Elf_Xword.
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index af7cb2dbd..6a93ab044 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -38,7 +38,6 @@
 
 extern char *progname;
 extern int verbosity;
-extern jmp_buf main_env;
 
 void grub_util_warn (const char *fmt, ...);
 void grub_util_info (const char *fmt, ...);
diff --git a/util/grub-emu.c b/util/grub-emu.c
index c133dbead..31365f3e0 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -40,7 +40,7 @@
 #include <grub_emu_init.h>
 
 /* Used for going back to the main function.  */
-jmp_buf main_env;
+static jmp_buf main_env;
 
 /* Store the prefix specified by an argument.  */
 static char *prefix = 0;
@@ -68,6 +68,22 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
   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
 grub_machine_init (void)
 {
diff --git a/util/misc.c b/util/misc.c
index 2d0039028..f615a42c7 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -439,19 +439,3 @@ fail:
 }
 
 #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 ();
-}