diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-06-24 22:52:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:51:41 +0200 |
| commit | c376d45432d935e6f1e0ff2d6be3734bcd3ba455 (patch) | |
| tree | c776405c9734a11e6947b55cd2c44e4d7ec1fcfb /include/asm-x86/nmi.h | |
| parent | 2b6addad2d67a2d75ae10a1c8efd18d81d78ff82 (diff) | |
x86: nmi_watchdog - use NMI_NONE by default
There is no need to keep NMI_DISABLED definition and use it
for nmi_watchdog by default. Here is the point why:
- IO-APIC and APIC chips are programmed for nmi_watchdog support at very
early stage of kernel booting and not having nmi_watchdog specified as
boot option lead only to nmi_watchdog becomes to NMI_NONE anyway
- enable nmi_watchdog thru /proc/sys/kernel/nmi if it was not specified at
boot is not possible too (even having this sysfs entry)
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: macro@linux-mips.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/nmi.h')
| -rw-r--r-- | include/asm-x86/nmi.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index f0e435dd38f..1348e542360 100644 --- a/include/asm-x86/nmi.h +++ b/include/asm-x86/nmi.h @@ -20,7 +20,6 @@ extern void default_do_nmi(struct pt_regs *); #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); @@ -38,12 +37,10 @@ extern int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason); extern atomic_t nmi_active; extern unsigned int nmi_watchdog; -#define NMI_DISABLED -1 #define NMI_NONE 0 #define NMI_IO_APIC 1 #define NMI_LOCAL_APIC 2 #define NMI_INVALID 3 -#define NMI_DEFAULT NMI_DISABLED struct ctl_table; struct file; |