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.
This commit is contained in:
parent
660e9c195f
commit
fb908db4ad
2 changed files with 10 additions and 3 deletions
|
@ -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>
|
2005-02-02 Yoshinori K. Okuji <okuji@enbug.org>
|
||||||
|
|
||||||
* stage2/smp-imps.h (imps_any_new_apics): Removed.
|
* stage2/smp-imps.h (imps_any_new_apics): Removed.
|
||||||
|
|
|
@ -90,7 +90,7 @@ char **device_map = 0;
|
||||||
static jmp_buf env_for_exit;
|
static jmp_buf env_for_exit;
|
||||||
|
|
||||||
/* The current color for console. */
|
/* 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. */
|
/* The file descriptor for a serial device. */
|
||||||
static int serial_fd = -1;
|
static int serial_fd = -1;
|
||||||
|
@ -113,11 +113,11 @@ grub_stage2 (void)
|
||||||
char *scratch, *simstack;
|
char *scratch, *simstack;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
auto volatile void doit (void);
|
auto void doit (void);
|
||||||
|
|
||||||
/* We need a nested function so that we get a clean stack frame,
|
/* We need a nested function so that we get a clean stack frame,
|
||||||
regardless of how the code is optimized. */
|
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. */
|
/* Make sure our stack lives in the simulated memory area. */
|
||||||
asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"
|
asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue