x86: IO-APIC - use NMI_NONE instead of numeric constant
authorCyrill Gorcunov <gorcunov@gmail.com>
Thu, 29 May 2008 18:32:30 +0000 (22:32 +0400)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:13:12 +0000 (09:13 +0200)
Not sure but maybe it is better to use NMI_DISABLED,
will take a look. But for now this patch is not change
anything in logic so it will not hurt/broke the kernel.
For most cases nmi_watchdog assignment is by one of NMI_*
macro so I think there it make sense too.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c

index a69a59d19e187999184a398fa28af9828167c20f..5c0f8d6496a628b63e25dc887f6238631c5ec885 100644 (file)
@@ -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;
 
index 8991567c76b73568d8ed90ee2d5e620deac914b7..40a184d4dff89f1944c406f28182de93ce82485a 100644 (file)
@@ -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...");