aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-12 17:04:23 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 17:04:23 -0400
commit2f0798a3b1c2155b8f30858e853557aef9da2e4e (patch)
treea7a8c08d84dea9bef33e02eeccd499a6e8f6fc75 /arch/x86
parent5d5a2989b72847e1f5763420ea31383ca63ebf53 (diff)
x86: unify timex.h variants
Combine the timex.h variants and move the TSC related code into tsc.h. Move the set_cyc2ns_scale() call into the tsc calibraction code, where it belongs. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/time_64.c1
-rw-r--r--arch/x86/kernel/tsc_64.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index 16f58886e8dc..aca081c37884 100644
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -328,7 +328,6 @@ void __init time_init(void)
328 else 328 else
329 vgetcpu_mode = VGETCPU_LSL; 329 vgetcpu_mode = VGETCPU_LSL;
330 330
331 set_cyc2ns_scale(tsc_khz);
332 printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n", 331 printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n",
333 cpu_khz / 1000, cpu_khz % 1000); 332 cpu_khz / 1000, cpu_khz % 1000);
334 init_tsc_clocksource(); 333 init_tsc_clocksource();
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c
index 59baecd135ab..9f22e542c374 100644
--- a/arch/x86/kernel/tsc_64.c
+++ b/arch/x86/kernel/tsc_64.c
@@ -20,7 +20,7 @@ EXPORT_SYMBOL(tsc_khz);
20 20
21static unsigned int cyc2ns_scale __read_mostly; 21static unsigned int cyc2ns_scale __read_mostly;
22 22
23void set_cyc2ns_scale(unsigned long khz) 23static inline void set_cyc2ns_scale(unsigned long khz)
24{ 24{
25 cyc2ns_scale = (NSEC_PER_MSEC << NS_SCALE) / khz; 25 cyc2ns_scale = (NSEC_PER_MSEC << NS_SCALE) / khz;
26} 26}
@@ -206,6 +206,7 @@ void __init tsc_calibrate(void)
206 } 206 }
207 207
208 tsc_khz = tsc2 / tsc1; 208 tsc_khz = tsc2 / tsc1;
209 set_cyc2ns_scale(tsc_khz);
209} 210}
210 211
211/* 212/*