From 35b62ec32b30a922fbd7922d5a42c220edce52df Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Wed, 21 May 2008 22:09:34 +0100 Subject: [PATCH] --- yaml --- r: 99319 b: refs/heads/master c: 60134ebe795b728dbb960485a8e873c3250ada36 h: refs/heads/master i: 99317: 0722327b80ab47e7d43e59d90803fd5bc43bbfad 99315: cc9fff9258a02ebf4363395822addba8bae8ac7d 99311: 353710975430a18494f6ef096f7c2fddd3a97436 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/io_apic_32.c | 2 ++ trunk/arch/x86/kernel/io_apic_64.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 20bf9b787cb6..5a1ac8d0b90e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e67465f1298671266a8e824c1751afdb7c08c860 +refs/heads/master: 60134ebe795b728dbb960485a8e873c3250ada36 diff --git a/trunk/arch/x86/kernel/io_apic_32.c b/trunk/arch/x86/kernel/io_apic_32.c index e7b7655c4e94..41218ac75d10 100644 --- a/trunk/arch/x86/kernel/io_apic_32.c +++ b/trunk/arch/x86/kernel/io_apic_32.c @@ -2199,7 +2199,9 @@ static inline void __init check_timer(void) else add_pin_to_irq(0, apic2, pin2); if (nmi_watchdog == NMI_IO_APIC) { + disable_8259A_irq(0); setup_nmi(); + enable_8259A_irq(0); } goto out; } diff --git a/trunk/arch/x86/kernel/io_apic_64.c b/trunk/arch/x86/kernel/io_apic_64.c index 6433fc99f1f9..aa45a85c4d11 100644 --- a/trunk/arch/x86/kernel/io_apic_64.c +++ b/trunk/arch/x86/kernel/io_apic_64.c @@ -1702,7 +1702,9 @@ static inline void __init check_timer(void) apic_printk(APIC_VERBOSE," works.\n"); nmi_watchdog_default(); if (nmi_watchdog == NMI_IO_APIC) { + disable_8259A_irq(0); setup_nmi(); + enable_8259A_irq(0); } goto out; }