ia64/xen-unstable

changeset 9008:4db98649cc36

[IA64] xen_timer_interval removed (was not used).

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Tue Feb 28 12:43:08 2006 -0700 (2006-02-28)
parents f4b83d04643c
children b417cb20f1db
files xen/arch/ia64/xen/vcpu.c xen/include/asm-ia64/domain.h
line diff
     1.1 --- a/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 12:23:46 2006 -0700
     1.2 +++ b/xen/arch/ia64/xen/vcpu.c	Tue Feb 28 12:43:08 2006 -0700
     1.3 @@ -985,15 +985,6 @@ IA64FAULT vcpu_set_lrr1(VCPU *vcpu, UINT
     1.4  	return (IA64_NO_FAULT);
     1.5  }
     1.6  
     1.7 -// parameter is a time interval specified in cycles
     1.8 -void vcpu_enable_timer(VCPU *vcpu,UINT64 cycles)
     1.9 -{
    1.10 -    PSCBX(vcpu,xen_timer_interval) = cycles;
    1.11 -    vcpu_set_next_timer(vcpu);
    1.12 -    printf("vcpu_enable_timer: interval set to %lu cycles\n",
    1.13 -             PSCBX(vcpu,xen_timer_interval));
    1.14 -}
    1.15 -
    1.16  IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val)
    1.17  {
    1.18  //extern unsigned long privop_trace;
    1.19 @@ -1001,10 +992,11 @@ IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT6
    1.20  	if (val & 0xef00) return (IA64_ILLOP_FAULT);
    1.21  	PSCB(vcpu,itv) = val;
    1.22  	if (val & 0x10000) {
    1.23 -printf("**** vcpu_set_itv(%lu): vitm=%lx, setting to 0\n",val,PSCBX(vcpu,domain_itm));
    1.24 +		printf("**** vcpu_set_itv(%lu): vitm=%lx, setting to 0\n",
    1.25 +		       val,PSCBX(vcpu,domain_itm));
    1.26  		PSCBX(vcpu,domain_itm) = 0;
    1.27  	}
    1.28 -	else vcpu_enable_timer(vcpu,1000000L);
    1.29 +	else vcpu_set_next_timer(vcpu);
    1.30  	return (IA64_NO_FAULT);
    1.31  }
    1.32  
    1.33 @@ -1086,7 +1078,6 @@ void vcpu_set_next_timer(VCPU *vcpu)
    1.34  	//UINT64 s = PSCBX(vcpu,xen_itm);
    1.35  	UINT64 s = local_cpu_data->itm_next;
    1.36  	UINT64 now = ia64_get_itc();
    1.37 -	//UINT64 interval = PSCBX(vcpu,xen_timer_interval);
    1.38  
    1.39  	/* gloss over the wraparound problem for now... we know it exists
    1.40  	 * but it doesn't matter right now */
     2.1 --- a/xen/include/asm-ia64/domain.h	Tue Feb 28 12:23:46 2006 -0700
     2.2 +++ b/xen/include/asm-ia64/domain.h	Tue Feb 28 12:43:08 2006 -0700
     2.3 @@ -59,7 +59,6 @@ struct arch_vcpu {
     2.4  	unsigned long domain_itm;
     2.5  	unsigned long domain_itm_last;
     2.6  	unsigned long xen_itm;
     2.7 -	unsigned long xen_timer_interval;
     2.8  #endif
     2.9      mapped_regs_t *privregs; /* save the state of vcpu */
    2.10      unsigned long metaphysical_rr0;		// from arch_domain (so is pinned)