From 3fc9c6bf12d1878d385c43337751c5dc6ec20746 Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Wed, 13 Jan 2010 16:19:10 -0800 Subject: [PATCH] --- yaml --- r: 185149 b: refs/heads/master c: 722b3654852e48b93367a63f8ada9ee1cd43f2d3 h: refs/heads/master i: 185147: a4634f2d7e8b08b3730a8806cd04b64ce293dcc4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vmiclock_32.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c8ec7385aed8..d2e67617c7df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea94396629a3e0cb9a3a9c75335b1de255b30426 +refs/heads/master: 722b3654852e48b93367a63f8ada9ee1cd43f2d3 diff --git a/trunk/arch/x86/kernel/vmiclock_32.c b/trunk/arch/x86/kernel/vmiclock_32.c index 74c92bb194df..1268d993e9ca 100644 --- a/trunk/arch/x86/kernel/vmiclock_32.c +++ b/trunk/arch/x86/kernel/vmiclock_32.c @@ -79,11 +79,7 @@ unsigned long vmi_tsc_khz(void) static inline unsigned int vmi_get_timer_vector(void) { -#ifdef CONFIG_X86_IO_APIC - return FIRST_DEVICE_VECTOR; -#else - return FIRST_EXTERNAL_VECTOR; -#endif + return IRQ0_VECTOR; } /** vmi clockchip */ @@ -239,8 +235,6 @@ void __init vmi_time_init(void) vmi_time_init_clockevent(); 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