]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
x86: nmi_watchdog - use NMI_NONE by default
authorCyrill Gorcunov <gorcunov@gmail.com>
Tue, 24 Jun 2008 20:52:05 +0000 (22:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:51:41 +0000 (12:51 +0200)
commitc376d45432d935e6f1e0ff2d6be3734bcd3ba455
treec776405c9734a11e6947b55cd2c44e4d7ec1fcfb
parent2b6addad2d67a2d75ae10a1c8efd18d81d78ff82
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>
arch/x86/kernel/apic_64.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/nmi.c
arch/x86/kernel/smpboot.c
include/asm-x86/nmi.h