diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-06-04 01:00:47 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-06-05 15:13:59 +0200 |
| commit | 3ed3f06295e69700fa808396f7b350bff2b69de0 (patch) | |
| tree | 055601a094e512a1eabad4dd8352dae16658e575 /arch/x86/kernel/nmi.c | |
| parent | 3d1ba1da2b4ff4ace7801e99fb9a3095b182d847 (diff) | |
| download | linux-stable-3ed3f06295e69700fa808396f7b350bff2b69de0.tar.gz linux-stable-3ed3f06295e69700fa808396f7b350bff2b69de0.tar.bz2 linux-stable-3ed3f06295e69700fa808396f7b350bff2b69de0.zip | |
x86: nmi - consolidate nmi_watchdog_default for 32bit mode
64bit mode bootstrap code does set nmi_watchdog to NMI_NONE
by default and doing the same on 32bit mode is safe too.
Such an action saves us from several #ifdef.
Btw, my previous commit
commit 19ec673ced067316b9732bc6d1c4ff4052e5f795
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed May 28 23:00:47 2008 +0400
x86: nmi - fix incorrect NMI watchdog used by default
did not fix the problem completely, moreover it
introduced additional bug - nmi_watchdog would be
set to either NMI_LOCAL_APIC or NMI_IO_APIC
_regardless_ to boot option if being enabled thru
/proc/sys/kernel/nmi_watchdog. Sorry for that.
Fix it too.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: mingo@redhat.com
Cc: hpa@zytor.com
Cc: macro@linux-mips.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index cbd4fa3c475b..27ca8f69b466 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -487,14 +487,16 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, return -EIO; } -#ifdef CONFIG_X86_64 /* if nmi_watchdog is not set yet, then set it */ nmi_watchdog_default(); -#else - if (lapic_watchdog_ok()) - nmi_watchdog = NMI_LOCAL_APIC; - else - nmi_watchdog = NMI_IO_APIC; + +#ifdef CONFIG_X86_32 + if (nmi_watchdog == NMI_NONE) { + if (lapic_watchdog_ok()) + nmi_watchdog = NMI_LOCAL_APIC; + else + nmi_watchdog = NMI_IO_APIC; + } #endif if (nmi_watchdog == NMI_LOCAL_APIC) { |