1.1 --- a/xen/arch/ia64/xen/xentime.c	Tue Nov 06 16:04:13 2007 +0000
     1.2 +++ b/xen/arch/ia64/xen/xentime.c	Tue Nov 06 14:03:36 2007 -0700
     1.3 @@ -38,9 +38,9 @@ seqlock_t xtime_lock __cacheline_aligned
     1.4  
     1.5  #define TIME_KEEPER_ID  0
     1.6  unsigned long domain0_ready = 0;
     1.7 -static s_time_t        stime_irq = 0x0;       /* System time at last 'time update' */
     1.8 -unsigned long itc_scale __read_mostly, ns_scale __read_mostly;
     1.9 -unsigned long itc_at_irq;
    1.10 +static s_time_t stime_irq = 0x0;       /* System time at last 'time update' */
    1.11 +static unsigned long itc_scale __read_mostly, ns_scale __read_mostly;
    1.12 +static unsigned long itc_at_irq;
    1.13  
    1.14  static u32 wc_sec, wc_nsec; /* UTC time at last 'time update'. */
    1.15  static void ia64_wallclock_set(void);
    1.16 @@ -54,7 +54,7 @@ u64 cycle_to_ns(u64 cycle)
    1.17      return (cycle * itc_scale) >> 32;
    1.18  }
    1.19  
    1.20 -u64 ns_to_cycle(u64 ns)
    1.21 +static u64 ns_to_cycle(u64 ns)
    1.22  {
    1.23      return (ns * ns_scale) >> 32;
    1.24  }
    1.25 @@ -93,41 +93,11 @@ void update_vcpu_system_time(struct vcpu
    1.26      return;
    1.27  }
    1.28  
    1.29 -void update_domain_wallclock_time(struct domain *d)
    1.30 -{
    1.31 -    /* N-op here, and let dom0 to manage system time directly */
    1.32 -    return;
    1.33 -}
    1.34 -
    1.35 -/* Set clock to <secs,usecs> after 00:00:00 UTC, 1 January, 1970. */
    1.36 -void do_settime(unsigned long secs, unsigned long nsecs, u64 system_time_base)
    1.37 -{
    1.38 -    /* If absolute system time is managed by dom0, there's no need for such
    1.39 -     * action since only virtual itc/itm service is provided.
    1.40 -     */
    1.41 -    return;
    1.42 -}
    1.43 -
    1.44  void
    1.45  xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
    1.46  {
    1.47  	unsigned long new_itm, old_itc;
    1.48  
    1.49 -#if 0
    1.50 -#define HEARTBEAT_FREQ 16	// period in seconds
    1.51 -#ifdef HEARTBEAT_FREQ
    1.52 -	static long count = 0;
    1.53 -	if (!(++count & ((HEARTBEAT_FREQ*1024)-1))) {
    1.54 -		printk("Heartbeat... iip=%p\n", /*",psr.i=%d,pend=%d\n", */
    1.55 -			regs->cr_iip /*,
    1.56 -			!current->vcpu_info->evtchn_upcall_mask,
    1.57 -			VCPU(current,pending_interruption) */);
    1.58 -		count = 0;
    1.59 -	}
    1.60 -#endif
    1.61 -#endif
    1.62 -
    1.63 -
    1.64  	new_itm = local_cpu_data->itm_next;
    1.65  	while (1) {
    1.66  		if (smp_processor_id() == TIME_KEEPER_ID) {
    1.67 @@ -138,9 +108,6 @@ xen_timer_interrupt (int irq, void *dev_
    1.68  			 * xtime_lock.
    1.69  			 */
    1.70  			write_seqlock(&xtime_lock);
    1.71 -#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
    1.72 -			do_timer(regs);
    1.73 -#endif
    1.74  			/* Updates system time (nanoseconds since boot). */
    1.75  			old_itc = itc_at_irq;
    1.76  			itc_at_irq = ia64_get_itc();