Messages in this thread Patch in this message | | | Date | Thu, 29 May 2008 22:32:30 +0400 | From | Cyrill Gorcunov <> | Subject | [PATCH] x86: IO-APIC - use NMI_NONE instead of numeric constant |
| |
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> ---
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.
Index: linux-2.6.git/arch/x86/kernel/io_apic_32.c ==================================================================== --- linux-2.6.git.orig/arch/x86/kernel/io_apic_32.c 2008-05-24 11:28:40.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/io_apic_32.c 2008-05-29 22:22:25.000000000 +0400 @@ -2217,7 +2217,7 @@ static inline void __init check_timer(vo 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; } printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); Index: linux-2.6.git/arch/x86/kernel/io_apic_64.c ==================================================================== --- linux-2.6.git.orig/arch/x86/kernel/io_apic_64.c 2008-05-24 11:28:40.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/io_apic_64.c 2008-05-29 22:23:04.000000000 +0400 @@ -1735,7 +1735,7 @@ static inline void __init check_timer(vo 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...");
| |