aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/time.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 10:51:07 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 03:35:47 -0400
commitdd0a70c8f921708eba29ef9f30dde1f14a74af05 (patch)
treef2f90747921275dbf5df37e65eba580376235f6a /arch/x86/kernel/time.c
parent2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78 (diff)
x86: Move tsc_init to late_time_init
We do not need the TSC before late_time_init. Move the tsc_init to the late time init code so we can also utilize HPET for calibration (which we claimed to do but never did except in some older kernel version). This also helps Moorestown to calibrate the TSC with the AHBT timer which needs to be initialized in late_time_init like HPET. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/time.c')
-rw-r--r--arch/x86/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index fda0c34da757..fcece00356a4 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -108,6 +108,7 @@ void __init hpet_time_init(void)
108static void x86_late_time_init(void) 108static void x86_late_time_init(void)
109{ 109{
110 x86_init.timers.timer_init(); 110 x86_init.timers.timer_init();
111 tsc_init();
111} 112}
112 113
113/* 114/*
@@ -116,6 +117,5 @@ static void x86_late_time_init(void)
116 */ 117 */
117void __init time_init(void) 118void __init time_init(void)
118{ 119{
119 tsc_init();
120 late_time_init = x86_late_time_init; 120 late_time_init = x86_late_time_init;
121} 121}