1.1 --- a/xen/arch/ia64/xen/domain.c	Wed Oct 04 22:12:01 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/domain.c	Wed Oct 04 22:12:14 2006 -0600
     1.3 @@ -59,13 +59,8 @@ extern unsigned long running_on_sim;
     1.4  
     1.5  extern char dom0_command_line[];
     1.6  
     1.7 -/* FIXME: where these declarations should be there ? */
     1.8 -extern void serial_input_init(void);
     1.9 +/* forward declaration */
    1.10  static void init_switch_stack(struct vcpu *v);
    1.11 -extern void vmx_do_launch(struct vcpu *);
    1.12 -
    1.13 -/* this belongs in include/asm, but there doesn't seem to be a suitable place */
    1.14 -extern struct vcpu *ia64_switch_to (struct vcpu *next_task);
    1.15  
    1.16  /* Address of vpsr.i (in fact evtchn_upcall_mask) of current vcpu.
    1.17     This is a Xen virtual address.  */
    1.18 @@ -1103,9 +1098,6 @@ int construct_dom0(struct domain *d,
    1.19  
    1.20  	physdev_init_dom0(d);
    1.21  
    1.22 -	// FIXME: Hack for keyboard input
    1.23 -	//serial_input_init();
    1.24 -
    1.25  	return 0;
    1.26  }
    1.27  

     2.1 --- a/xen/include/asm-ia64/linux-xen/asm/system.h	Wed Oct 04 22:12:01 2006 -0600
     2.2 +++ b/xen/include/asm-ia64/linux-xen/asm/system.h	Wed Oct 04 22:12:14 2006 -0600
     2.3 @@ -189,6 +189,7 @@ do {								\
     2.4  
     2.5  #ifdef XEN
     2.6  #define local_irq_is_enabled() (!irqs_disabled())
     2.7 +extern struct vcpu *ia64_switch_to(struct vcpu *next_task);
     2.8  #else
     2.9  #ifdef __KERNEL__
    2.10  

     3.1 --- a/xen/include/asm-ia64/vmx.h	Wed Oct 04 22:12:01 2006 -0600
     3.2 +++ b/xen/include/asm-ia64/vmx.h	Wed Oct 04 22:12:14 2006 -0600
     3.3 @@ -35,6 +35,7 @@ extern void vmx_final_setup_guest(struct
     3.4  extern void vmx_save_state(struct vcpu *v);
     3.5  extern void vmx_load_state(struct vcpu *v);
     3.6  extern void vmx_setup_platform(struct domain *d);
     3.7 +extern void vmx_do_launch(struct vcpu *v);
     3.8  extern void vmx_io_assist(struct vcpu *v);
     3.9  extern int ia64_hypercall (struct pt_regs *regs);
    3.10  extern void vmx_save_state(struct vcpu *v);