diff options
Diffstat (limited to 'arch/x86/kernel/time_64.c')
-rw-r--r-- | arch/x86/kernel/time_64.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c index 5ba343e61844..38a7df94c107 100644 --- a/arch/x86/kernel/time_64.c +++ b/arch/x86/kernel/time_64.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/mca.h> | 19 | #include <linux/mca.h> |
20 | #include <linux/nmi.h> | 20 | #include <linux/nmi.h> |
21 | 21 | ||
22 | #include <asm/x86_init.h> | ||
22 | #include <asm/i8253.h> | 23 | #include <asm/i8253.h> |
23 | #include <asm/hpet.h> | 24 | #include <asm/hpet.h> |
24 | #include <asm/vgtod.h> | 25 | #include <asm/vgtod.h> |
@@ -127,9 +128,13 @@ void __init hpet_time_init(void) | |||
127 | setup_irq(0, &irq0); | 128 | setup_irq(0, &irq0); |
128 | } | 129 | } |
129 | 130 | ||
131 | static void x86_late_time_init(void) | ||
132 | { | ||
133 | x86_init.timers.timer_init(); | ||
134 | } | ||
135 | |||
130 | void __init time_init(void) | 136 | void __init time_init(void) |
131 | { | 137 | { |
132 | tsc_init(); | 138 | tsc_init(); |
133 | 139 | late_time_init = x86_late_time_init; | |
134 | late_time_init = choose_time_init(); | ||
135 | } | 140 | } |