diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-08-04 16:57:42 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-08-04 16:57:42 +0100 |
| commit | 192191da8a36d8a618f2a218c003e31e4e874b9a (patch) | |
| tree | 62c6402fd2280aed7c5d35a017ee02a6c3e7bade | |
| parent | 23566e775d1e90064a01107d5e6c75a00ab6a2fe (diff) | |
| download | xen-192191da8a36d8a618f2a218c003e31e4e874b9a.tar.gz xen-192191da8a36d8a618f2a218c003e31e4e874b9a.tar.bz2 xen-192191da8a36d8a618f2a218c003e31e4e874b9a.zip | |
Revert 18150:b47e503f3282
| -rw-r--r-- | xen/arch/x86/time.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 1c73840b61..747e12be75 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -35,8 +35,7 @@ static char opt_clocksource[10]; string_param("clocksource", opt_clocksource); -#define EPOCH (1ULL << 30) /* one second, rounded up to a power of two */ -#define NEXT_EPOCH(now) (((now) + (EPOCH+(EPOCH/2))) & ~(EPOCH-1)) +#define EPOCH MILLISECS(1000) unsigned long cpu_khz; /* CPU clock frequency in kHz. */ DEFINE_SPINLOCK(rtc_lock); @@ -1022,7 +1021,7 @@ static void local_time_calibration(void *unused) update_vcpu_system_time(current); out: - set_timer(&t->calibration_timer, NEXT_EPOCH(curr_local_stime)); + set_timer(&t->calibration_timer, NOW() + EPOCH); if ( smp_processor_id() == 0 ) platform_time_calibration(); @@ -1051,7 +1050,7 @@ void init_percpu_time(void) out: init_timer(&t->calibration_timer, local_time_calibration, NULL, smp_processor_id()); - set_timer(&t->calibration_timer, NEXT_EPOCH(NOW())); + set_timer(&t->calibration_timer, NOW() + EPOCH); } /* Late init function (after all CPUs are booted). */ |