diff options
| author |   Zachary Amsden <zach@vmware.com> | 2007-02-13 13:26:21 +0100 |
|---|---|---|
| committer |   Andi Kleen <andi@basil.nowhere.org> | 2007-02-13 13:26:21 +0100 |
| commit | 90736e20e3805dd1ffff60e4750495944956cd44 (patch) | |
| tree | 700df54aaa675a6afbcf256c771c3ba452f9ea4c /arch/i386/kernel/vmitime.c | |
| parent | [PATCH] i386: Kprobe rpl fix (diff) | |
| download | linux-dev-90736e20e3805dd1ffff60e4750495944956cd44.tar.xz linux-dev-90736e20e3805dd1ffff60e4750495944956cd44.zip | |
[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>
Diffstat (limited to 'arch/i386/kernel/vmitime.c')
| -rw-r--r-- | arch/i386/kernel/vmitime.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/vmitime.c b/arch/i386/kernel/vmitime.c index 7c3033dbe5f5..2e2d8dbcbd68 100644 --- 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 |