Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90736e20 authored by Zachary Amsden's avatar Zachary Amsden Committed by Andi Kleen
Browse files

[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: default avatarZachary Amsden <zach@vmware.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent ac3b6faf

arch/i386/kernel/vmitime.c

+4 −0
Original line number Diff line number Diff line
@@ -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