Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core

Trivial conflict in arch/x86/Kconfig

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 06ccb5073a3f..4b9ea101fe3b 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -623,7 +623,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));
         }