ia64/xen-unstable

changeset 8810:5aad88c8d379

Remove xennull_con. Use dummy_con.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Feb 09 15:57:52 2006 +0100 (2006-02-09)
parents 3bbff714df11
children 4ee359893af4
files linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c linux-2.6-xen-sparse/drivers/xen/console/console.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Thu Feb 09 13:54:58 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Thu Feb 09 15:57:52 2006 +0100
     1.3 @@ -1865,13 +1865,14 @@ void __init setup_arch(char **cmdline_p)
     1.4  #endif
     1.5  #endif
     1.6  	} else {
     1.7 -		extern const struct consw xennull_con;
     1.8  		extern int console_use_vt;
     1.9  #if defined(CONFIG_VGA_CONSOLE)
    1.10  		/* disable VGA driver */
    1.11  		ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
    1.12  #endif
    1.13 -		conswitchp = &xennull_con;
    1.14 +#if defined(CONFIG_DUMMY_CONSOLE)
    1.15 +		conswitchp = &dummy_con;
    1.16 +#endif
    1.17  		console_use_vt = 0;
    1.18  	}
    1.19  }
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Thu Feb 09 13:54:58 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Thu Feb 09 15:57:52 2006 +0100
     2.3 @@ -940,36 +940,37 @@ void __init setup_arch(char **cmdline_p)
     2.4  #endif
     2.5  
     2.6  #ifdef CONFIG_XEN
     2.7 -       {
     2.8 -	       physdev_op_t op;
     2.9 +	{
    2.10 +		physdev_op_t op;
    2.11  
    2.12 -	       op.cmd             = PHYSDEVOP_SET_IOPL;
    2.13 -	       op.u.set_iopl.iopl = 1;
    2.14 -	       HYPERVISOR_physdev_op(&op);
    2.15 +		op.cmd             = PHYSDEVOP_SET_IOPL;
    2.16 +		op.u.set_iopl.iopl = 1;
    2.17 +		HYPERVISOR_physdev_op(&op);
    2.18  
    2.19 -	       if (xen_start_info->flags & SIF_INITDOMAIN) {
    2.20 -		       if (!(xen_start_info->flags & SIF_PRIVILEGED))
    2.21 -			       panic("Xen granted us console access "
    2.22 -				     "but not privileged status");
    2.23 +		if (xen_start_info->flags & SIF_INITDOMAIN) {
    2.24 +			if (!(xen_start_info->flags & SIF_PRIVILEGED))
    2.25 +				panic("Xen granted us console access "
    2.26 +				      "but not privileged status");
    2.27  		       
    2.28  #ifdef CONFIG_VT
    2.29  #if defined(CONFIG_VGA_CONSOLE)
    2.30 -		       conswitchp = &vga_con;
    2.31 +			conswitchp = &vga_con;
    2.32  #elif defined(CONFIG_DUMMY_CONSOLE)
    2.33 -		       conswitchp = &dummy_con;
    2.34 +			conswitchp = &dummy_con;
    2.35  #endif
    2.36  #endif
    2.37 -	       } else {
    2.38 -		       extern const struct consw xennull_con;
    2.39 -		       extern int console_use_vt;
    2.40 +		} else {
    2.41 +			extern int console_use_vt;
    2.42  #if defined(CONFIG_VGA_CONSOLE)
    2.43 -		       /* disable VGA driver */
    2.44 -		       ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
    2.45 +			/* disable VGA driver */
    2.46 +			ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
    2.47  #endif
    2.48 -		       conswitchp = &xennull_con;
    2.49 -		       console_use_vt = 0;
    2.50 -	       }
    2.51 -       }
    2.52 +#if defined(CONFIG_DUMMY_CONSOLE)
    2.53 +			conswitchp = &dummy_con;
    2.54 +#endif
    2.55 +			console_use_vt = 0;
    2.56 +		}
    2.57 +	}
    2.58  #else	/* CONFIG_XEN */
    2.59  
    2.60  #ifdef CONFIG_VT
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Thu Feb 09 13:54:58 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Thu Feb 09 15:57:52 2006 +0100
     3.3 @@ -562,45 +562,6 @@ static struct tty_operations xencons_ops
     3.4  	.wait_until_sent = xencons_wait_until_sent,
     3.5  };
     3.6  
     3.7 -static const char *xennullcon_startup(void)
     3.8 -{
     3.9 -	return NULL;
    3.10 -}
    3.11 -
    3.12 -static int xennullcon_dummy(void)
    3.13 -{
    3.14 -	return 0;
    3.15 -}
    3.16 -
    3.17 -#define DUMMY (void *)xennullcon_dummy
    3.18 -
    3.19 -/*
    3.20 - *  The console `switch' structure for the dummy console
    3.21 - *
    3.22 - *  Most of the operations are dummies.
    3.23 - */
    3.24 -
    3.25 -const struct consw xennull_con = {
    3.26 -	.owner =		THIS_MODULE,
    3.27 -	.con_startup =	xennullcon_startup,
    3.28 -	.con_init =		DUMMY,
    3.29 -	.con_deinit =	DUMMY,
    3.30 -	.con_clear =	DUMMY,
    3.31 -	.con_putc =		DUMMY,
    3.32 -	.con_putcs =	DUMMY,
    3.33 -	.con_cursor =	DUMMY,
    3.34 -	.con_scroll =	DUMMY,
    3.35 -	.con_bmove =	DUMMY,
    3.36 -	.con_switch =	DUMMY,
    3.37 -	.con_blank =	DUMMY,
    3.38 -	.con_font_set =	DUMMY,
    3.39 -	.con_font_get =	DUMMY,
    3.40 -	.con_font_default =	DUMMY,
    3.41 -	.con_font_copy =	DUMMY,
    3.42 -	.con_set_palette =	DUMMY,
    3.43 -	.con_scrolldelta =	DUMMY,
    3.44 -};
    3.45 -
    3.46  static int __init xencons_init(void)
    3.47  {
    3.48  	int rc;