From dac1005eb0af5fd03e9ae63ec230fa0c9c3fb2a4 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Thu, 29 May 2008 22:32:30 +0400 Subject: [PATCH] --- yaml --- r: 99335 b: refs/heads/master c: 067fa0ff0c89d25c2136ed095c72213089d4bb4e h: refs/heads/master i: 99333: c835f629bd29a8565600adae6f61f6e9fdf0c2d7 99331: e7986231f6db41538ea90f55dd0e0cc5dbde6707 99327: e206a8aecbd055021f8d5408da59f2698ea712aa 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, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 77aa0fbfc80b..294fee42f7d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1b57ee135ac7614184faa7d7345b5e7098cb81d +refs/heads/master: 067fa0ff0c89d25c2136ed095c72213089d4bb4e diff --git a/trunk/arch/x86/kernel/io_apic_32.c b/trunk/arch/x86/kernel/io_apic_32.c index a69a59d19e18..5c0f8d6496a6 100644 --- a/trunk/arch/x86/kernel/io_apic_32.c +++ b/trunk/arch/x86/kernel/io_apic_32.c @@ -2229,7 +2229,7 @@ static inline void __init check_timer(void) if (nmi_watchdog == NMI_IO_APIC) { printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); - nmi_watchdog = 0; + nmi_watchdog = NMI_NONE; } timer_ack = 0; diff --git a/trunk/arch/x86/kernel/io_apic_64.c b/trunk/arch/x86/kernel/io_apic_64.c index 8991567c76b7..40a184d4dff8 100644 --- a/trunk/arch/x86/kernel/io_apic_64.c +++ b/trunk/arch/x86/kernel/io_apic_64.c @@ -1736,7 +1736,7 @@ static inline void __init check_timer(void) if (nmi_watchdog == NMI_IO_APIC) { printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); - nmi_watchdog = 0; + nmi_watchdog = NMI_NONE; } apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");