1.1 --- a/xen/arch/ia64/vmx/vlsapic.c	Tue Apr 25 22:35:41 2006 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vlsapic.c	Tue Apr 25 22:38:25 2006 -0600
     1.3 @@ -121,7 +121,7 @@ void vtm_init(VCPU *vcpu)
     1.4      itc_freq = local_cpu_data->itc_freq;
     1.5      vtm->cfg_max_jump=itc_freq*MAX_JUMP_STEP/1000;
     1.6      vtm->cfg_min_grun=itc_freq*MIN_GUEST_RUNNING_TIME/1000;
     1.7 -    init_timer(&vtm->vtm_timer, vtm_timer_fn, vcpu, 0);
     1.8 +    init_timer(&vtm->vtm_timer, vtm_timer_fn, vcpu, vcpu->processor);
     1.9      vtm_reset(vcpu);
    1.10  }
    1.11  

     2.1 --- a/xen/arch/ia64/xen/xentime.c	Tue Apr 25 22:35:41 2006 -0600
     2.2 +++ b/xen/arch/ia64/xen/xentime.c	Tue Apr 25 22:38:25 2006 -0600
     2.3 @@ -146,9 +146,9 @@ xen_timer_interrupt (int irq, void *dev_
     2.4  			 * another CPU. We need to avoid to SMP race by acquiring the
     2.5  			 * xtime_lock.
     2.6  			 */
     2.7 -#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
     2.8 +//#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
     2.9  			write_seqlock(&xtime_lock);
    2.10 -#endif
    2.11 +//#endif
    2.12  #ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
    2.13  			do_timer(regs);
    2.14  #endif
    2.15 @@ -159,9 +159,9 @@ xen_timer_interrupt (int irq, void *dev_
    2.16  			itc_at_irq = ia64_get_itc();
    2.17  			stime_irq += cycle_to_ns(itc_at_irq - old_itc);
    2.18  
    2.19 -#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
    2.20 +//#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
    2.21  			write_sequnlock(&xtime_lock);
    2.22 -#endif
    2.23 +//#endif
    2.24  		} else
    2.25  			local_cpu_data->itm_next = new_itm;
    2.26