direct-io.hg

changeset 8150:d84ffe8f32ae

fix the console when only XEN_PHYSDEV_ACCESS is Yes.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vhanquez@kneesa.uk.xensource.com
date Thu Dec 01 07:31:50 2005 +0000 (2005-12-01)
parents dab434c9349c
children f5b119533cc8
files linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c linux-2.6-xen-sparse/drivers/xen/console/console.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Thu Dec 01 12:27:29 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Thu Dec 01 07:31:50 2005 +0000
     1.3 @@ -1752,7 +1752,7 @@ void __init setup_arch(char **cmdline_p)
     1.4  #endif
     1.5  #endif
     1.6  	} else {
     1.7 -#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     1.8 +#ifdef CONFIG_XEN_PHYSDEV_ACCESS
     1.9  		extern const struct consw xennull_con;
    1.10  		extern int console_use_vt;
    1.11  #if defined(CONFIG_VGA_CONSOLE)
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Thu Dec 01 12:27:29 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Thu Dec 01 07:31:50 2005 +0000
     2.3 @@ -579,7 +579,7 @@ static struct tty_operations xencons_ops
     2.4  	.wait_until_sent = xencons_wait_until_sent,
     2.5  };
     2.6  
     2.7 -#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     2.8 +#ifdef CONFIG_XEN_PHYSDEV_ACCESS
     2.9  static const char *xennullcon_startup(void)
    2.10  {
    2.11  	return NULL;