From fb908db4addddb9167b7a179ce735879ef4462e7 Mon Sep 17 00:00:00 2001 From: okuji Date: Thu, 3 Feb 2005 10:01:14 +0000 Subject: [PATCH] 2005-02-03 Yoshinori K. Okuji * grub/asmstub.c (console_current_color): Make it global as declared. (grub_stage2): Tweak the declaration and the definition of the nested function doit. --- ChangeLog | 7 +++++++ grub/asmstub.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ad1038b1..7f6b386c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-02-03 Yoshinori K. Okuji + + * grub/asmstub.c (console_current_color): Make it global as + declared. + (grub_stage2): Tweak the declaration and the definition of the + nested function doit. + 2005-02-02 Yoshinori K. Okuji * stage2/smp-imps.h (imps_any_new_apics): Removed. diff --git a/grub/asmstub.c b/grub/asmstub.c index e313c85e6..1a4b82f29 100644 --- a/grub/asmstub.c +++ b/grub/asmstub.c @@ -90,7 +90,7 @@ char **device_map = 0; static jmp_buf env_for_exit; /* The current color for console. */ -static int console_current_color = A_NORMAL; +int console_current_color = A_NORMAL; /* The file descriptor for a serial device. */ static int serial_fd = -1; @@ -113,11 +113,11 @@ grub_stage2 (void) char *scratch, *simstack; int i; - auto volatile void doit (void); + auto void doit (void); /* We need a nested function so that we get a clean stack frame, regardless of how the code is optimized. */ - auto volatile void doit (void) + volatile void doit (void) { /* Make sure our stack lives in the simulated memory area. */ asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"