---

yaml --- r: 99335 b: refs/heads/master c: 067fa0f h: refs/heads/master i: 99333: c835f62 99331: e798623 99327: e206a8a v: v3
git-mirror · Jul 8, 2008 · dac1005 · dac1005
1 parent 474d68b
commit dac1005
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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...");