Commit 722b3654 authored by Suresh Siddha's avatar Suresh Siddha Committed by H. Peter Anvin

x86, vmi: Fix vmi_get_timer_vector() to use IRQ0_VECTOR

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: default avatarSuresh 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: default avatarH. Peter Anvin <hpa@zytor.com>
parent ea943966
...@@ -79,11 +79,7 @@ unsigned long vmi_tsc_khz(void) ...@@ -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) ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment