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 /include/asm-x86/nmi.h | |
| parent | 3d1ba1da2b4ff4ace7801e99fb9a3095b182d847 (diff) | |
| download | blackbird-op-linux-3ed3f06295e69700fa808396f7b350bff2b69de0.tar.gz blackbird-op-linux-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 'include/asm-x86/nmi.h')
| -rw-r--r-- | include/asm-x86/nmi.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index 972a4f6f799a..470bb4aacb75 100644 --- a/include/asm-x86/nmi.h +++ b/include/asm-x86/nmi.h @@ -38,12 +38,10 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev) #ifdef CONFIG_X86_64 extern void default_do_nmi(struct pt_regs *); -extern void nmi_watchdog_default(void); -#else -#define nmi_watchdog_default() do { } while (0) #endif extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); +extern void nmi_watchdog_default(void); extern int check_nmi_watchdog(void); extern int nmi_watchdog_enabled; extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); |
