diff options
Diffstat (limited to 'arch/x86/kernel/time_32.c')
-rw-r--r-- | arch/x86/kernel/time_32.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 2ff21f39893..ffe3c664afc 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
@@ -39,9 +39,6 @@ | |||
39 | 39 | ||
40 | #include "do_timer.h" | 40 | #include "do_timer.h" |
41 | 41 | ||
42 | unsigned int cpu_khz; /* Detected as we calibrate the TSC */ | ||
43 | EXPORT_SYMBOL(cpu_khz); | ||
44 | |||
45 | int timer_ack; | 42 | int timer_ack; |
46 | 43 | ||
47 | unsigned long profile_pc(struct pt_regs *regs) | 44 | unsigned long profile_pc(struct pt_regs *regs) |
@@ -84,8 +81,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
84 | if (timer_ack) { | 81 | if (timer_ack) { |
85 | /* | 82 | /* |
86 | * Subtle, when I/O APICs are used we have to ack timer IRQ | 83 | * Subtle, when I/O APICs are used we have to ack timer IRQ |
87 | * manually to reset the IRR bit for do_slow_gettimeoffset(). | 84 | * manually to deassert NMI lines for the watchdog if run |
88 | * This will also deassert NMI lines for the watchdog if run | ||
89 | * on an 82489DX-based system. | 85 | * on an 82489DX-based system. |
90 | */ | 86 | */ |
91 | spin_lock(&i8259A_lock); | 87 | spin_lock(&i8259A_lock); |
@@ -133,6 +129,7 @@ void __init hpet_time_init(void) | |||
133 | */ | 129 | */ |
134 | void __init time_init(void) | 130 | void __init time_init(void) |
135 | { | 131 | { |
132 | pre_time_init_hook(); | ||
136 | tsc_init(); | 133 | tsc_init(); |
137 | late_time_init = choose_time_init(); | 134 | late_time_init = choose_time_init(); |
138 | } | 135 | } |