ia64/xen-unstable

changeset 13974:449fb89590e7

linux: early_printk adjustments

This is a little more than a pure merge with 2.6.17, to remove a few
more non-Xen items.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Thu Feb 15 13:40:33 2007 +0000 (2007-02-15)
parents b3c41b9f01a6
children 24f16bae44b0
files linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c	Thu Feb 15 13:38:59 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c	Thu Feb 15 13:40:33 2007 +0000
     1.3 @@ -18,9 +18,8 @@
     1.4  #define VGABASE		((void __iomem *)0xffffffff800b8000UL)
     1.5  #endif
     1.6  
     1.7 +#ifndef CONFIG_XEN
     1.8  static int max_ypos = 25, max_xpos = 80;
     1.9 -
    1.10 -#ifndef CONFIG_XEN
    1.11  static int current_ypos = 25, current_xpos = 0; 
    1.12  
    1.13  static void early_vga_write(struct console *con, const char *str, unsigned n)
    1.14 @@ -154,10 +153,6 @@ static __init void early_serial_init(cha
    1.15  
    1.16  #else /* CONFIG_XEN */
    1.17  
    1.18 -#undef SCREEN_INFO
    1.19 -#define SCREEN_INFO screen_info
    1.20 -extern struct screen_info screen_info;
    1.21 -
    1.22  static void
    1.23  early_serial_write(struct console *con, const char *s, unsigned count)
    1.24  {
    1.25 @@ -273,11 +268,13 @@ int __init setup_early_printk(char *opt)
    1.26  		early_serial_init(buf);
    1.27  		early_console = &early_serial_console;
    1.28  	} else if (!strncmp(buf, "vga", 3)
    1.29 +#ifndef CONFIG_XEN
    1.30  	           && SCREEN_INFO.orig_video_isVGA == 1) {
    1.31  		max_xpos = SCREEN_INFO.orig_video_cols;
    1.32  		max_ypos = SCREEN_INFO.orig_video_lines;
    1.33 -#ifndef CONFIG_XEN
    1.34  		current_ypos = SCREEN_INFO.orig_y;
    1.35 +#else
    1.36 +	           || !strncmp(buf, "xen", 3)) {
    1.37  #endif
    1.38  		early_console = &early_vga_console;
    1.39   	} else if (!strncmp(buf, "simnow", 6)) {