From 27317084c612341a425e4f7889e9a26cd5b71d23 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 26 Feb 2012 21:04:45 +0100
Subject: [PATCH] 	* grub-core/lib/i386/backtrace.c (grub_cmd_backtrace):
 Move from ... 	* grub-core/lib/backtrace.c (grub_cmd_backtrace): ... to here.
 	* grub-core/lib/i386/backtrace.c (GRUB_MOD_INIT): Move from ... 
 * grub-core/lib/backtrace.c (GRUB_MOD_INIT): ... to here. 	Gettextize. 
 * grub-core/lib/i386/backtrace.c (GRUB_MOD_FINI): Move from ... 	*
 grub-core/lib/backtrace.c (GRUB_MOD_FINI): ... to here. 	*
 po/POTFILES.in: Regenerate.

---
 ChangeLog                      | 11 +++++++++++
 grub-core/lib/backtrace.c      | 22 ++++++++++++++++++++++
 grub-core/lib/i386/backtrace.c | 21 ---------------------
 po/POTFILES.in                 |  9 +++++++++
 4 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2fdc8b616..273cdbacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/i386/backtrace.c (grub_cmd_backtrace): Move from ...
+	* grub-core/lib/backtrace.c (grub_cmd_backtrace): ... to here.
+	* grub-core/lib/i386/backtrace.c (GRUB_MOD_INIT): Move from ...
+	* grub-core/lib/backtrace.c (GRUB_MOD_INIT): ... to here.
+	Gettextize.
+	* grub-core/lib/i386/backtrace.c (GRUB_MOD_FINI): Move from ...
+	* grub-core/lib/backtrace.c (GRUB_MOD_FINI): ... to here.
+	* po/POTFILES.in: Regenerate.
+
 2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/probe.c (grub_cmd_probe): Gettextise UUID and label
diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
index bf2f7aa82..32945d9f8 100644
--- a/grub-core/lib/backtrace.c
+++ b/grub-core/lib/backtrace.c
@@ -46,3 +46,25 @@ grub_backtrace_print_address (void *addr)
 
   grub_printf ("%p", addr);
 }
+
+static grub_err_t
+grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
+		    int argc __attribute__ ((unused)),
+		    char **args __attribute__ ((unused)))
+{
+  grub_backtrace ();
+  return 0;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(backtrace)
+{
+  cmd = grub_register_command ("backtrace", grub_cmd_backtrace,
+			       0, N_("Print backtrace."));
+}
+
+GRUB_MOD_FINI(backtrace)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
index 978693396..c673ea45e 100644
--- a/grub-core/lib/i386/backtrace.c
+++ b/grub-core/lib/i386/backtrace.c
@@ -64,24 +64,3 @@ grub_backtrace (void)
 #endif
 }
 
-static grub_err_t
-grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
-		    int argc __attribute__ ((unused)),
-		    char **args __attribute__ ((unused)))
-{
-  grub_backtrace ();
-  return 0;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(backtrace)
-{
-  cmd = grub_register_command ("backtrace", grub_cmd_backtrace,
-			       0, "Print backtrace.");
-}
-
-GRUB_MOD_FINI(backtrace)
-{
-  grub_unregister_command (cmd);
-}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3d10f8f31..2801cbd81 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -166,6 +166,10 @@
 ./grub-core/fs/zfs/zfsinfo.c
 ./grub-core/fs/zfs/zfs_lzjb.c
 ./grub-core/fs/zfs/zfs_sha256.c
+./grub-core/gdb/cstub.c
+./grub-core/gdb/gdb.c
+./grub-core/gdb/i386/idt.c
+./grub-core/gdb/i386/signal.c
 ./grub-core/gentrigtables.c
 ./grub-core/gettext/gettext.c
 ./grub-core/gfxmenu/font.c
@@ -309,6 +313,7 @@
 ./grub-core/lib/adler32.c
 ./grub-core/lib/arc/datetime.c
 ./grub-core/lib/arg.c
+./grub-core/lib/backtrace.c
 ./grub-core/lib/cmdline.c
 ./grub-core/lib/cmos_datetime.c
 ./grub-core/lib/crc64.c
@@ -320,7 +325,9 @@
 ./grub-core/lib/efi/relocator.c
 ./grub-core/lib/emu/halt.c
 ./grub-core/lib/envblk.c
+./grub-core/lib/fake_module.c
 ./grub-core/lib/hexdump.c
+./grub-core/lib/i386/backtrace.c
 ./grub-core/lib/i386/halt.c
 ./grub-core/lib/i386/pc/biosnum.c
 ./grub-core/lib/i386/pc/vesa_modes_table.c
@@ -495,12 +502,14 @@
 ./grub-core/term/arc/console.c
 ./grub-core/term/at_keyboard.c
 ./grub-core/term/efi/console.c
+./grub-core/term/efi/serial.c
 ./grub-core/term/emu/console.c
 ./grub-core/term/gfxterm.c
 ./grub-core/term/i386/pc/console.c
 ./grub-core/term/i386/pc/vga_text.c
 ./grub-core/term/i386/vga_common.c
 ./grub-core/term/ieee1275/console.c
+./grub-core/term/ieee1275/serial.c
 ./grub-core/term/ns8250.c
 ./grub-core/term/serial.c
 ./grub-core/term/terminfo.c