aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-05-29 14:32:30 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 03:13:12 -0400
commit067fa0ff0c89d25c2136ed095c72213089d4bb4e (patch)
treea17b0e379705b8b32917a0ee53ceacc74badc231 /arch
parentb1b57ee135ac7614184faa7d7345b5e7098cb81d (diff)
x86: IO-APIC - use NMI_NONE instead of numeric constant
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/io_apic_32.c2
-rw-r--r--arch/x86/kernel/io_apic_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index a69a59d19e18..5c0f8d6496a6 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -2229,7 +2229,7 @@ static inline void __init check_timer(void)
2229 2229
2230 if (nmi_watchdog == NMI_IO_APIC) { 2230 if (nmi_watchdog == NMI_IO_APIC) {
2231 printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); 2231 printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
2232 nmi_watchdog = 0; 2232 nmi_watchdog = NMI_NONE;
2233 } 2233 }
2234 timer_ack = 0; 2234 timer_ack = 0;
2235 2235
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 8991567c76b7..40a184d4dff8 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1736,7 +1736,7 @@ static inline void __init check_timer(void)
1736 1736
1737 if (nmi_watchdog == NMI_IO_APIC) { 1737 if (nmi_watchdog == NMI_IO_APIC) {
1738 printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); 1738 printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
1739 nmi_watchdog = 0; 1739 nmi_watchdog = NMI_NONE;
1740 } 1740 }
1741 1741
1742 apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); 1742 apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");