[PATCH] i386: Vmi timer race

Because timer code moves around, and we might eventually move our init to a
late_time_init hook, save and restore IRQs around this code because it is
definitely not interrupt safe.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andi Kleen <ak@suse.de>

diff --git a/arch/i386/kernel/vmitime.c b/arch/i386/kernel/vmitime.c
index 7c3033dbe5f5afc11386c9b02ccbe2ec4d331c64..2e2d8dbcbd68bee1d6bf4cf6052cea2c02fedc12 100644 (file)
--- a/arch/i386/kernel/vmitime.c
+++ b/arch/i386/kernel/vmitime.c
@@ -180,7 +180,9 @@ unsigned long long vmi_sched_clock(void)
 void __init vmi_time_init(void)
 {
        unsigned long long cycles_per_sec, cycles_per_msec;
+       unsigned long flags;
 
+       local_irq_save(flags);
        setup_irq(0, &vmi_timer_irq);
 #ifdef CONFIG_X86_LOCAL_APIC
        set_intr_gate(LOCAL_TIMER_VECTOR, apic_vmi_timer_interrupt);
@@ -224,6 +226,8 @@ void __init vmi_time_init(void)
                      VMI_ALARM_WIRED_IRQ0 | VMI_ALARM_IS_PERIODIC | VMI_CYCLES_AVAILABLE,
                      per_cpu(process_times_cycles_accounted_cpu, 0) + cycles_per_alarm,
                      cycles_per_alarm);
+
+       local_irq_restore(flags);
 }
 
 #ifdef CONFIG_X86_LOCAL_APIC