leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] i386: Vmi timer race

Browse Source 
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>
This commit is contained in:
Zachary Amsden 2007-02-13 13:26:21 +01:00 committed by Andi Kleen
parent ac3b6faff9
commit 90736e20e3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/i386/kernel/vmitime.c
View File

@ -180,7 +180,9 @@ unsigned long long vmi_sched_clock(void)
void __init vmi_time_init(void) void __init vmi_time_init(void)
{ {
unsigned long long cycles_per_sec, cycles_per_msec; unsigned long long cycles_per_sec, cycles_per_msec;
unsigned long flags;
local_irq_save(flags);
setup_irq(0, &vmi_timer_irq); setup_irq(0, &vmi_timer_irq);
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
set_intr_gate(LOCAL_TIMER_VECTOR, apic_vmi_timer_interrupt); 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, VMI_ALARM_WIRED_IRQ0 | VMI_ALARM_IS_PERIODIC | VMI_CYCLES_AVAILABLE,
per_cpu(process_times_cycles_accounted_cpu, 0) + cycles_per_alarm, per_cpu(process_times_cycles_accounted_cpu, 0) + cycles_per_alarm,
cycles_per_alarm); cycles_per_alarm);
local_irq_restore(flags);
} }
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC