浏览代码

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>
Thomas Gleixner 16 年之前
父节点
当前提交
dd0a70c8f9
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/x86/kernel/time.c

+ 1 - 1
arch/x86/kernel/time.c

@@ -108,6 +108,7 @@ void __init hpet_time_init(void)
 static void x86_late_time_init(void)
 static void x86_late_time_init(void)
 {
 {
 	x86_init.timers.timer_init();
 	x86_init.timers.timer_init();
+	tsc_init();
 }
 }
 
 
 /*
 /*
@@ -116,6 +117,5 @@ static void x86_late_time_init(void)
  */
  */
 void __init time_init(void)
 void __init time_init(void)
 {
 {
-	tsc_init();
 	late_time_init = x86_late_time_init;
 	late_time_init = x86_late_time_init;
 }
 }