diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-29 16:22:25 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-29 16:22:25 +0000 |
| commit | 3cd648a5b1f3fbd64e1102c8d24580c4e6f9ffb8 (patch) | |
| tree | 36381a4e92de6273abdfb72608e512596f5bc4b7 | |
| parent | 8b5918674e6db47b5344e4f88e47aaa09715c177 (diff) | |
| download | xen-3cd648a5b1f3fbd64e1102c8d24580c4e6f9ffb8.tar.gz xen-3cd648a5b1f3fbd64e1102c8d24580c4e6f9ffb8.tar.bz2 xen-3cd648a5b1f3fbd64e1102c8d24580c4e6f9ffb8.zip | |
bitkeeper revision 1.1769 (42c2cac1Ua7yeT9FnpvjJNvdSrd3BA)
Remove ticks_per_usec global variable. cpu_khz suffices.
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | xen/arch/x86/delay.c | 3 | ||||
| -rw-r--r-- | xen/arch/x86/time.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-x86/delay.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/xen/arch/x86/delay.c b/xen/arch/x86/delay.c index cde5e18b5f..f796870a0d 100644 --- a/xen/arch/x86/delay.c +++ b/xen/arch/x86/delay.c @@ -12,12 +12,13 @@ #include <xen/config.h> #include <xen/delay.h> +#include <xen/time.h> #include <asm/msr.h> #include <asm/processor.h> void __udelay(unsigned long usecs) { - unsigned long ticks = usecs * ticks_per_usec; + unsigned long ticks = usecs * (cpu_khz / 1000); unsigned long s, e; rdtscl(s); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 2efd0187b0..acc5979c2b 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -33,8 +33,7 @@ #include <asm/mc146818rtc.h> /* GLOBAL */ -unsigned long cpu_khz; /* Detected as we calibrate the TSC */ -unsigned long ticks_per_usec; /* TSC ticks per microsecond. */ +unsigned long cpu_khz; /* CPU clock frequency in kHz. */ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; int timer_ack = 0; unsigned long volatile jiffies; @@ -375,7 +374,6 @@ void __init time_init(void) if ( !ticks_per_frac ) panic("Error calibrating TSC\n"); - ticks_per_usec = ticks_per_frac / (1000000/CALIBRATE_FRAC); cpu_khz = ticks_per_frac / (1000/CALIBRATE_FRAC); cpu_freq = (u64)ticks_per_frac * (u64)CALIBRATE_FRAC; diff --git a/xen/include/asm-x86/delay.h b/xen/include/asm-x86/delay.h index b294c41918..9be2f46590 100644 --- a/xen/include/asm-x86/delay.h +++ b/xen/include/asm-x86/delay.h @@ -7,7 +7,6 @@ * Delay routines calling functions in arch/i386/lib/delay.c */ -extern unsigned long ticks_per_usec; extern void __udelay(unsigned long usecs); #define udelay(n) __udelay(n) |