From 81989c2beead5851a4535addb62d57b9df8c06e2 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 30 May 2006 22:47:54 +0200 Subject: [PATCH] --- yaml --- r: 27033 b: refs/heads/master c: b2468e525f29882f866cb0b832956e69328f9647 h: refs/heads/master i: 27031: c3fef8b67c635e1b73d0d2f876e54840c1a30730 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/pmtimer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f94b301b888d..cda21976ea75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ba567cbd7626700b800d4ce9503bd3cd78ed7ef +refs/heads/master: b2468e525f29882f866cb0b832956e69328f9647 diff --git a/trunk/arch/x86_64/kernel/pmtimer.c b/trunk/arch/x86_64/kernel/pmtimer.c index b0444a415bd6..bf421ed26808 100644 --- a/trunk/arch/x86_64/kernel/pmtimer.c +++ b/trunk/arch/x86_64/kernel/pmtimer.c @@ -68,7 +68,7 @@ int pmtimer_mark_offset(void) offset_delay = delta % (USEC_PER_SEC / HZ); rdtscll(tsc); - vxtime.last_tsc = tsc - offset_delay * cpu_khz; + vxtime.last_tsc = tsc - offset_delay * (u64)cpu_khz / 1000; /* don't calculate delay for first run, or if we've got less then a tick */