From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 20 Aug 2009 14:51:07 +0000 (+0200)
Subject: x86: Move tsc_init to late_time_init
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~25000^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dd0a70c8f921708eba29ef9f30dde1f14a74af05;p=mirror_ubuntu-artful-kernel.git

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>
---

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)
 static void x86_late_time_init(void)
 {
 	x86_init.timers.timer_init();
+	tsc_init();
 }
 
 /*
@@ -116,6 +117,5 @@ static void x86_late_time_init(void)
  */
 void __init time_init(void)
 {
-	tsc_init();
 	late_time_init = x86_late_time_init;
 }