From 2abf249d7a7a425f85ea4cd405aeccc24a931e67 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Thu, 19 Jun 2008 00:39:33 +0100 Subject: [PATCH] --- yaml --- r: 99347 b: refs/heads/master c: cd08d0754ecb0cb9293c8476cb33ded1d23d0d8f h: refs/heads/master i: 99345: 5336b04fbd98337d97bae9bf8c05debd034ad1eb 99343: 9707803874bfe71c5c78c25b5b419502086cf377 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/io_apic_64.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ddbb21f41197..0dc53deb27ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 360624484c81d55f88b1e5f48ce24c9243ce38e5 +refs/heads/master: cd08d0754ecb0cb9293c8476cb33ded1d23d0d8f diff --git a/trunk/arch/x86/kernel/io_apic_64.c b/trunk/arch/x86/kernel/io_apic_64.c index 60a022d6de5e..f06f5b4fb35f 100644 --- a/trunk/arch/x86/kernel/io_apic_64.c +++ b/trunk/arch/x86/kernel/io_apic_64.c @@ -1715,6 +1715,7 @@ static inline void __init check_timer(void) /* replace_pin_at_irq(0, apic1, pin1, apic2, pin2); */ setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); unmask_IO_APIC_irq(0); + clear_IO_APIC_pin(apic2, pin2); enable_8259A_irq(0); if (timer_irq_works()) { apic_printk(APIC_VERBOSE," works.\n");