1.1 --- a/xen/arch/ia64/linux-xen/smpboot.c	Tue Mar 07 17:12:39 2006 -0700
     1.2 +++ b/xen/arch/ia64/linux-xen/smpboot.c	Tue Mar 07 17:14:32 2006 -0700
     1.3 @@ -72,8 +72,7 @@ EXPORT_SYMBOL(cpu_online_map);
     1.4  
     1.5  #ifdef CONFIG_SMP /* ifdef XEN */
     1.6  
     1.7 -//#define SMP_DEBUG 0
     1.8 -#define SMP_DEBUG 1
     1.9 +#define SMP_DEBUG 0
    1.10  
    1.11  #if SMP_DEBUG
    1.12  #define Dprintk(x...)  printk(x)

     2.1 --- a/xen/arch/ia64/xen/domain.c	Tue Mar 07 17:12:39 2006 -0700
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Tue Mar 07 17:14:32 2006 -0700
     2.3 @@ -118,20 +118,7 @@ void startup_cpu_idle_loop(void)
     2.4  	int cpu = smp_processor_id ();
     2.5  	/* Just some sanity to ensure that the scheduler is set up okay. */
     2.6  	ASSERT(current->domain == IDLE_DOMAIN_ID);
     2.7 -	printf ("idle%dA\n", cpu);
     2.8  	raise_softirq(SCHEDULE_SOFTIRQ);
     2.9 -#if 0   /* All this work is done within continue_cpu_idle_loop  */
    2.10 -	printf ("idle%dB\n", cpu);
    2.11 -	asm volatile ("mov ar.k2=r0");
    2.12 -	do_softirq();
    2.13 -	printf ("idle%dC\n", cpu);
    2.14 -
    2.15 -	/*
    2.16 -	 * Declares CPU setup done to the boot processor.
    2.17 -	 * Therefore memory barrier to ensure state is visible.
    2.18 -	 */
    2.19 -	smp_mb();
    2.20 -#endif
    2.21  #if 0
    2.22  //do we have to ensure the idle task has a shared page so that, for example,
    2.23  //region registers can be loaded from it.  Apparently not...

     3.1 --- a/xen/arch/ia64/xen/vcpu.c	Tue Mar 07 17:12:39 2006 -0700
     3.2 +++ b/xen/arch/ia64/xen/vcpu.c	Tue Mar 07 17:14:32 2006 -0700
     3.3 @@ -1850,7 +1850,6 @@ IA64FAULT vcpu_fc(VCPU *vcpu, UINT64 vad
     3.4  	UINT64 mpaddr, paddr;
     3.5  	IA64FAULT fault;
     3.6  	unsigned long translate_domain_mpaddr(unsigned long);
     3.7 -	IA64FAULT vcpu_tpa(VCPU *, UINT64, UINT64 *);
     3.8  
     3.9  	fault = vcpu_tpa(vcpu, vadr, &mpaddr);
    3.10  	if (fault == IA64_NO_FAULT) {

     4.1 --- a/xen/arch/ia64/xen/xensetup.c	Tue Mar 07 17:12:39 2006 -0700
     4.2 +++ b/xen/arch/ia64/xen/xensetup.c	Tue Mar 07 17:14:32 2006 -0700
     4.3 @@ -331,7 +331,6 @@ printk("num_online_cpus=%d, max_cpus=%d\
     4.4          if ( num_online_cpus() >= max_cpus )
     4.5              break;
     4.6          if ( !cpu_online(i) ) {
     4.7 -printk("About to call __cpu_up(%d)\n",i);
     4.8              __cpu_up(i);
     4.9  	}
    4.10      }