diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-19 09:37:03 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 03:35:46 -0400 |
commit | 845b3944bbdf9e9247849bf037f27ff3a3f26d87 (patch) | |
tree | b14b40b5ba650996c646ed760cfa4b3283e04953 /arch/x86/kernel/tsc.c | |
parent | 736decac643e8982655e22ac7f0e5e61c5b7f9bd (diff) |
x86: Add timer_init to x86_init_ops
The timer init code is convoluted with several quirks and the paravirt
timer chooser. Figuring out which code path is actually taken is not
for the faint hearted.
Move the numaq TSC quirk to tsc_pre_init x86_init_ops function and
replace the paravirt time chooser and the remaining x86 quirk with a
simple x86_init_ops function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
-rw-r--r-- | arch/x86/kernel/tsc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 71f4368b357e..652bc214eebf 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
@@ -857,6 +857,8 @@ void __init tsc_init(void) | |||
857 | u64 lpj; | 857 | u64 lpj; |
858 | int cpu; | 858 | int cpu; |
859 | 859 | ||
860 | x86_init.timers.tsc_pre_init(); | ||
861 | |||
860 | if (!cpu_has_tsc) | 862 | if (!cpu_has_tsc) |
861 | return; | 863 | return; |
862 | 864 | ||