ia64/xen-unstable

changeset 11931:901083dace1d

[IA64] Move console_start_sync() in INIT path

This patch moves console_start_sync() before first message in
ia64_init_handler(), and it cleans up ia64_init_handler().

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Tue Oct 24 09:22:56 2006 -0600 (2006-10-24)
parents 6492b9b27968
children 9e9d8696fb55
files xen/arch/ia64/linux-xen/mca.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/mca.c	Sun Oct 22 15:23:52 2006 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/mca.c	Tue Oct 24 09:22:56 2006 -0600
     1.3 @@ -1220,12 +1220,6 @@ void
     1.4  ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw)
     1.5  {
     1.6  	pal_min_state_area_t *ms;
     1.7 -#ifdef XEN
     1.8 -	int cpu = smp_processor_id();
     1.9 -
    1.10 -	printk(KERN_INFO "Entered OS INIT handler. PSP=%lx\n",
    1.11 -	       ia64_sal_to_os_handoff_state[cpu].proc_state_param);
    1.12 -#endif
    1.13  
    1.14  #ifndef XEN
    1.15  	oops_in_progress = 1;	/* avoid deadlock in printk, but it makes recovery dodgy */
    1.16 @@ -1241,7 +1235,12 @@ ia64_init_handler (struct pt_regs *pt, s
    1.17  	 */
    1.18  	ms = (pal_min_state_area_t *)(ia64_sal_to_os_handoff_state.pal_min_state | (6ul<<61));
    1.19  #else
    1.20 +	int cpu = smp_processor_id();
    1.21 +
    1.22  	console_start_sync();
    1.23 +	printk(KERN_INFO "Entered OS INIT handler. PSP=%lx\n",
    1.24 +	       ia64_sal_to_os_handoff_state[cpu].proc_state_param);
    1.25 +
    1.26  	/* Xen virtual address in region 7. */
    1.27  	ms = __va((pal_min_state_area_t *)(ia64_sal_to_os_handoff_state[cpu].pal_min_state));
    1.28  #endif