x86: unify timex.h variants

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / tsc_64.c

diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c
index 59baecd135ab9e1f7170bf3cd6f674735e4c9031..9f22e542c37409e84967b4903f4a24bb7db56dfd 100644 (file)
--- 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);
 }
 
 /*