ia64/linux-2.6.18-xen.hg

changeset 261:c235ca877ee0

[IA64] Updated dom0_init_screen_info() params.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author Keir Fraser <keir@xensource.com>
date Sat Oct 13 08:40:34 2007 +0100 (2007-10-13)
parents 50bfa53b4a93
children 502a2072ed24
files arch/ia64/xen/hypervisor.c
line diff
     1.1 --- a/arch/ia64/xen/hypervisor.c	Sat Oct 13 08:40:08 2007 +0100
     1.2 +++ b/arch/ia64/xen/hypervisor.c	Sat Oct 13 08:40:34 2007 +0100
     1.3 @@ -55,21 +55,19 @@ EXPORT_SYMBOL(__hypercall);
     1.4  void __init
     1.5  xen_setup(char **cmdline_p)
     1.6  {
     1.7 +	struct dom0_vga_console_info *info;
     1.8  	extern void dig_setup(char **cmdline_p);
     1.9 +
    1.10  	if (ia64_platform_is("xen"))
    1.11  		dig_setup(cmdline_p);
    1.12  	
    1.13  	if (!is_running_on_xen() || !is_initial_xendomain())
    1.14  		return;
    1.15  
    1.16 -	if (xen_start_info->console.dom0.info_size >=
    1.17 -	    sizeof(struct dom0_vga_console_info)) {
    1.18 -		const struct dom0_vga_console_info *info =
    1.19 -		        (struct dom0_vga_console_info *)(
    1.20 -		                (char *)xen_start_info +
    1.21 -		                xen_start_info->console.dom0.info_off);
    1.22 -		dom0_init_screen_info(info);
    1.23 -	}
    1.24 +	info = (void *)((char *)xen_start_info +
    1.25 +			xen_start_info->console.dom0.info_off);
    1.26 +	dom0_init_screen_info(info, xen_start_info->console.dom0.info_size);
    1.27 +
    1.28  	xen_start_info->console.domU.mfn = 0;
    1.29  	xen_start_info->console.domU.evtchn = 0;
    1.30  }