# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID ac1ee42ff99c04a3a7d37783b54263f6f84abf1b
# Parent  c3f82be17d98100123bb8b5f62306820cdd3d6f2
xen_timer_interval removed (was not used).

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r c3f82be17d98 -r ac1ee42ff99c xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 04:50:44 2006
+++ b/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 05:29:40 2006
@@ -976,15 +976,6 @@
 	return (IA64_NO_FAULT);
 }
 
-// parameter is a time interval specified in cycles
-void vcpu_enable_timer(VCPU *vcpu,UINT64 cycles)
-{
-    PSCBX(vcpu,xen_timer_interval) = cycles;
-    vcpu_set_next_timer(vcpu);
-    printf("vcpu_enable_timer(%d): interval set to %d cycles\n",
-             PSCBX(vcpu,xen_timer_interval));
-}
-
 IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val)
 {
 extern unsigned long privop_trace;
@@ -992,10 +983,11 @@
 	if (val & 0xef00) return (IA64_ILLOP_FAULT);
 	PSCB(vcpu,itv) = val;
 	if (val & 0x10000) {
-printf("**** vcpu_set_itv(%d): vitm=%lx, setting to 0\n",val,PSCBX(vcpu,domain_itm));
+		printf("**** vcpu_set_itv(%d): vitm=%lx, setting to 0\n",
+		       val,PSCBX(vcpu,domain_itm));
 		PSCBX(vcpu,domain_itm) = 0;
 	}
-	else vcpu_enable_timer(vcpu,1000000L);
+	else vcpu_set_next_timer(vcpu);
 	return (IA64_NO_FAULT);
 }
 
@@ -1077,7 +1069,6 @@
 	//UINT64 s = PSCBX(vcpu,xen_itm);
 	UINT64 s = local_cpu_data->itm_next;
 	UINT64 now = ia64_get_itc();
-	//UINT64 interval = PSCBX(vcpu,xen_timer_interval);
 
 	/* gloss over the wraparound problem for now... we know it exists
 	 * but it doesn't matter right now */
diff -r c3f82be17d98 -r ac1ee42ff99c xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h	Tue Feb 28 04:50:44 2006
+++ b/xen/include/asm-ia64/domain.h	Tue Feb 28 05:29:40 2006
@@ -59,7 +59,6 @@
 	unsigned long domain_itm;
 	unsigned long domain_itm_last;
 	unsigned long xen_itm;
-	unsigned long xen_timer_interval;
 #endif
     mapped_regs_t *privregs; /* save the state of vcpu */
     unsigned long metaphysical_rr0;		// from arch_domain (so is pinned)