diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-10-15 17:13:22 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-10-16 17:38:31 -0700 |
| commit | 30c826451d3e5bbc6e11bba0e7fee5d2f49d9b75 (patch) | |
| tree | 61abd11d1703673ff21227d42ed4b07d85dd0290 /arch/x86/kernel/early_printk.c | |
| parent | 2b0460b534f383eca744eb8fff66ec9f57e702b9 (diff) | |
| download | kernel_goldelico_gta04-30c826451d3e5bbc6e11bba0e7fee5d2f49d9b75.zip kernel_goldelico_gta04-30c826451d3e5bbc6e11bba0e7fee5d2f49d9b75.tar.gz kernel_goldelico_gta04-30c826451d3e5bbc6e11bba0e7fee5d2f49d9b75.tar.bz2 | |
[x86] remove uses of magic macros for boot_params access
Instead of using magic macros for boot_params access, simply use the
boot_params structure.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/early_printk.c')
| -rw-r--r-- | arch/x86/kernel/early_printk.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index fd9aff3..b7d6c23 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c @@ -6,15 +6,10 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/fcntl.h> +#include <asm/setup.h> #include <xen/hvc-console.h> /* Simple VGA output */ - -#ifdef __i386__ -#include <asm/setup.h> -#else -#include <asm/bootsetup.h> -#endif #define VGABASE (__ISA_IO_base + 0xb8000) static int max_ypos = 25, max_xpos = 80; @@ -234,10 +229,10 @@ static int __init setup_early_printk(char *buf) early_serial_init(buf); early_console = &early_serial_console; } else if (!strncmp(buf, "vga", 3) - && SCREEN_INFO.orig_video_isVGA == 1) { - max_xpos = SCREEN_INFO.orig_video_cols; - max_ypos = SCREEN_INFO.orig_video_lines; - current_ypos = SCREEN_INFO.orig_y; + && boot_params.screen_info.orig_video_isVGA == 1) { + max_xpos = boot_params.screen_info.orig_video_cols; + max_ypos = boot_params.screen_info.orig_video_lines; + current_ypos = boot_params.screen_info.orig_y; early_console = &early_vga_console; } else if (!strncmp(buf, "simnow", 6)) { simnow_init(buf + 6); |