---

yaml --- r: 350161 b: refs/heads/master c: 2353b47 h: refs/heads/master i: 350159: 85f24f6 v: v3
git-mirror · Jan 16, 2013 · 9f8d94c · 9f8d94c
1 parent ec20d1c
commit 9f8d94c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 023f333a99cee9b5cd3268ff87298eb01a31f78e
+refs/heads/master: 2353b47bffe4e6ab39042f470c55d41bb3ff3846
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
@@ -617,7 +617,8 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
 	ns_now = __cycles_2_ns(tsc_now);
 
 	if (cpu_khz) {
-		*scale = (NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR)/cpu_khz;
+		*scale = ((NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR) +
+				cpu_khz / 2) / cpu_khz;
 		*offset = ns_now - mult_frac(tsc_now, *scale,
 					     (1UL << CYC2NS_SCALE_FACTOR));
 	}