---

yaml --- r: 27033 b: refs/heads/master c: b2468e5 h: refs/heads/master i: 27031: c3fef8b v: v3
git-mirror · May 31, 2006 · 81989c2 · 81989c2
1 parent acc209e
commit 81989c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */