From 9f8d94c7a37638fa4ff6ebacbe9d603a526fcdb9 Mon Sep 17 00:00:00 2001
From: Bernd Faust <berndfaust@gmail.com>
Date: Wed, 5 Dec 2012 15:16:49 +0100
Subject: [PATCH] --- yaml --- r: 350161 b: refs/heads/master c:
 2353b47bffe4e6ab39042f470c55d41bb3ff3846 h: refs/heads/master i:   350159:
 85f24f6c85435326b896987a9a9237bd86c1b22e v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/tsc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08246cf85a97..4a68cd2ba564 100644
--- 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
index cfa5d4f7ca56..8ed085733773 100644
--- 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));
 	}