1.1 --- a/xen/arch/ia64/xen/xensetup.c	Wed Aug 09 10:13:37 2006 +0100
     1.2 +++ b/xen/arch/ia64/xen/xensetup.c	Wed Aug 09 10:44:33 2006 +0100
     1.3 @@ -423,13 +423,14 @@ void start_kernel(void)
     1.4  	(xenheap_phys_end-__pa(heap_start)) >> 20,
     1.5  	(xenheap_phys_end-__pa(heap_start)) >> 10);
     1.6  
     1.7 +    late_setup_arch(&cmdline);
     1.8 +
     1.9      scheduler_init();
    1.10      idle_vcpu[0] = (struct vcpu*) ia64_r13;
    1.11      idle_domain = domain_create(IDLE_DOMAIN_ID);
    1.12      if ( (idle_domain == NULL) || (alloc_vcpu(idle_domain, 0, 0) == NULL) )
    1.13          BUG();
    1.14  
    1.15 -    late_setup_arch(&cmdline);
    1.16      alloc_dom_xen_and_dom_io();
    1.17      setup_per_cpu_areas();
    1.18      mem_init();

     2.1 --- a/xen/common/domain.c	Wed Aug 09 10:13:37 2006 +0100
     2.2 +++ b/xen/common/domain.c	Wed Aug 09 10:44:33 2006 +0100
     2.3 @@ -21,6 +21,7 @@
     2.4  #include <xen/hypercall.h>
     2.5  #include <xen/delay.h>
     2.6  #include <xen/shutdown.h>
     2.7 +#include <xen/percpu.h>
     2.8  #include <asm/debugger.h>
     2.9  #include <public/dom0_ops.h>
    2.10  #include <public/sched.h>

     3.1 --- a/xen/common/timer.c	Wed Aug 09 10:13:37 2006 +0100
     3.2 +++ b/xen/common/timer.c	Wed Aug 09 10:44:33 2006 +0100
     3.3 @@ -17,6 +17,7 @@
     3.4  #include <xen/softirq.h>
     3.5  #include <xen/timer.h>
     3.6  #include <xen/keyhandler.h>
     3.7 +#include <xen/percpu.h>
     3.8  #include <asm/system.h>
     3.9  #include <asm/desc.h>
    3.10