ia64/xen-unstable

changeset 8773:87a83b44930b

Fix x86_64 guest console support.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Tue Feb 07 11:54:09 2006 +0000 (2006-02-07)
parents 55268b90a519
children 2710f2fe624a
files linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb 07 01:02:49 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb 07 11:54:09 2006 +0000
     1.3 @@ -951,22 +951,20 @@ void __init setup_arch(char **cmdline_p)
     1.4  		       
     1.5  #ifdef CONFIG_VT
     1.6  #if defined(CONFIG_VGA_CONSOLE)
     1.7 -	       conswitchp = &vga_con;
     1.8 +		       conswitchp = &vga_con;
     1.9  #elif defined(CONFIG_DUMMY_CONSOLE)
    1.10 -	       conswitchp = &dummy_con;
    1.11 +		       conswitchp = &dummy_con;
    1.12  #endif
    1.13  #endif
    1.14  	       } else {
    1.15 -#ifdef CONFIG_XEN_PRIVILEGED_GUEST
    1.16  		       extern const struct consw xennull_con;
    1.17  		       extern int console_use_vt;
    1.18  #if defined(CONFIG_VGA_CONSOLE)
    1.19 -		/* disable VGA driver */
    1.20 +		       /* disable VGA driver */
    1.21  		       ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
    1.22  #endif
    1.23  		       conswitchp = &xennull_con;
    1.24  		       console_use_vt = 0;
    1.25 -#endif
    1.26  	       }
    1.27         }
    1.28  #else	/* CONFIG_XEN */