2 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index 16f58886e8d..aca081c3788 100644
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -328,7 +328,6 @@ void __init time_init(void)
         else
                 vgetcpu_mode = VGETCPU_LSL;
 
-        set_cyc2ns_scale(tsc_khz);
         printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n",
                 cpu_khz / 1000, cpu_khz % 1000);
         init_tsc_clocksource();
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c
index 59baecd135a..9f22e542c37 100644
--- a/arch/x86/kernel/tsc_64.c
+++ b/arch/x86/kernel/tsc_64.c
@@ -20,7 +20,7 @@ EXPORT_SYMBOL(tsc_khz);
 
 static unsigned int cyc2ns_scale __read_mostly;
 
-void set_cyc2ns_scale(unsigned long khz)
+static inline void set_cyc2ns_scale(unsigned long khz)
 {
         cyc2ns_scale = (NSEC_PER_MSEC << NS_SCALE) / khz;
 }
@@ -206,6 +206,7 @@ void __init tsc_calibrate(void)
         }
 
         tsc_khz = tsc2 / tsc1;
+        set_cyc2ns_scale(tsc_khz);
 }
 
 /*