Commit-ID: 46ce1b47fe8e956e8e5c23fe06c2238afb6eaf56 Gitweb: http://git.kernel.org/tip/46ce1b47fe8e956e8e5c23fe06c2238afb6eaf56 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Thu, 20 Aug 2009 16:51:07 +0200 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Thu, 27 Aug 2009 17:12:55 +0200 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@xxxxxxxxxxxxx> --- arch/x86/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c index 07d4846..bea834b 100644 --- a/arch/x86/kernel/time.c +++ b/arch/x86/kernel/time.c @@ -107,6 +107,7 @@ void __init hpet_time_init(void) static void x86_late_time_init(void) { x86_init.timers.timer_init(); + tsc_init(); } /* @@ -115,6 +116,5 @@ static void x86_late_time_init(void) */ void __init time_init(void) { - tsc_init(); late_time_init = x86_late_time_init; } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html