]> err.no Git - linux-2.6/commit
x86_64: Fix to keep watchdog disabled by default for i386/x86_64
authorDaniel Gollub <dgollub@suse.de>
Wed, 15 Aug 2007 00:40:35 +0000 (02:40 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 18 Aug 2007 17:25:25 +0000 (10:25 -0700)
commit0328ecef9041fe477efc2404fd3aaa29e7ee0430
tree10384b404a1052df528d947e6c2269f10b3b4712
parent8154549cb8ca795cbefda404cd6120398e5b145f
x86_64: Fix to keep watchdog disabled by default for i386/x86_64

Fixed wrong expression which enabled watchdogs even if nmi_watchdog kernel
parameter wasn't set. This regression got slightly introduced with commit
b7471c6da94d30d3deadc55986cc38d1ff57f9ca.

Introduced NMI_DISABLED (-1) which allows to switch the value of NMI_DEFAULT
without breaking the APIC NMI watchdog code (again).

Fixes:
   https://bugzilla.novell.com/show_bug.cgi?id=298084
   http://bugzilla.kernel.org/show_bug.cgi?id=7839
And likely some more nmi_watchdog=0 related issues.

Signed-off-by: Daniel Gollub <dgollub@suse.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/i386/kernel/apic.c
arch/i386/kernel/nmi.c
arch/x86_64/kernel/nmi.c
include/asm-i386/nmi.h
include/asm-x86_64/nmi.h