lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, vmi: Fix vmi_get_timer_vector() to use IRQ0_VECTOR

Browse Source 
FIRST_DEVICE_VECTOR is going away and it looks like a bad hack to steal
FIRST_DEVICE_VECTOR / FIRST_EXTERNAL_VECTOR, when it looks like it needs
IRQ0_VECTOR.

Fix vmi_get_timer_vector() to use IRQ0_VECTOR.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <20100114002118.436172066@sbs-t61.sc.intel.com>
Cc: Alok N Kataria <akataria@vmware.com>
Cc: Zach Amsden <zach@vmware.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Suresh Siddha
2010-01-13 16:19:10 -08:00
committed by H. Peter Anvin
parent ea94396629
commit 722b365485
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/vmiclock_32.c
View File

@@ -79,11 +79,7 @@ unsigned long vmi_tsc_khz(void)
static inline unsigned int vmi_get_timer_vector(void) static inline unsigned int vmi_get_timer_vector(void)
{ {
#ifdef CONFIG_X86_IO_APIC return IRQ0_VECTOR;
return FIRST_DEVICE_VECTOR;
#else
return FIRST_EXTERNAL_VECTOR;
#endif
} }
/** vmi clockchip */ /** vmi clockchip */
@@ -239,8 +235,6 @@ void __init vmi_time_init(void)
vmi_time_init_clockevent(); vmi_time_init_clockevent();
setup_irq(0, &vmi_clock_action); setup_irq(0, &vmi_clock_action);
for_each_possible_cpu(cpu)
per_cpu(vector_irq, cpu)[vmi_get_timer_vector()] = 0;
} }
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC