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

2005-02-03 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* grub/asmstub.c (console_current_color): Make it global as
  declared.
  (grub_stage2): Tweak the declaration and the definition of the
  nested function doit.
This commit is contained in:
okuji 2005-02-03 10:01:14 +00:00
parent 660e9c195f
commit fb908db4ad
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-02-03 Yoshinori K. Okuji <okuji@enbug.org>
* 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 <okuji@enbug.org>
* stage2/smp-imps.h (imps_any_new_apics): Removed.

6
grub/asmstub.c
View file

@ -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"