ia64/xen-unstable

changeset 8815:ee9691e23dbe

Don't specify VT console structure at all when specifying
!console_use_vt. The dummy_con just confuses the VT
implementation and you get no console output without manually
specifying a console= boot parameter.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Feb 09 17:42:51 2006 +0100 (2006-02-09)
parents c63083610678
children 1c69197d29b7
files linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Thu Feb 09 16:12:48 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Thu Feb 09 17:42:51 2006 +0100
     1.3 @@ -1866,13 +1866,6 @@ void __init setup_arch(char **cmdline_p)
     1.4  #endif
     1.5  	} else {
     1.6  		extern int console_use_vt;
     1.7 -#if defined(CONFIG_VGA_CONSOLE)
     1.8 -		/* disable VGA driver */
     1.9 -		ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
    1.10 -#endif
    1.11 -#if defined(CONFIG_DUMMY_CONSOLE)
    1.12 -		conswitchp = &dummy_con;
    1.13 -#endif
    1.14  		console_use_vt = 0;
    1.15  	}
    1.16  }
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Thu Feb 09 16:12:48 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Thu Feb 09 17:42:51 2006 +0100
     2.3 @@ -961,13 +961,6 @@ void __init setup_arch(char **cmdline_p)
     2.4  #endif
     2.5  		} else {
     2.6  			extern int console_use_vt;
     2.7 -#if defined(CONFIG_VGA_CONSOLE)
     2.8 -			/* disable VGA driver */
     2.9 -			ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
    2.10 -#endif
    2.11 -#if defined(CONFIG_DUMMY_CONSOLE)
    2.12 -			conswitchp = &dummy_con;
    2.13 -#endif
    2.14  			console_use_vt = 0;
    2.15  		}
    2.16  	}