diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 20:50:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 20:53:43 -0400 |
| commit | 8ce5e3e45e01ffab38a9f03900181132b9068543 (patch) | |
| tree | 87dbcacd8a6279d3bea2699448bca63f12d7e9c9 /arch/x86_64 | |
| parent | 4e337adae4e960f64043b9f433c4a825c902616c (diff) | |
Disable NMI watchdog by default properly
This reverts commit 6ebf622b2577c50b1f496bd6a5e8739e55ae7b1c and
replaces it with one that actually works.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/nmi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 486f4c61a948..82d9d85d5270 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c | |||
| @@ -187,10 +187,7 @@ void nmi_watchdog_default(void) | |||
| 187 | { | 187 | { |
| 188 | if (nmi_watchdog != NMI_DEFAULT) | 188 | if (nmi_watchdog != NMI_DEFAULT) |
| 189 | return; | 189 | return; |
| 190 | if (nmi_known_cpu()) | 190 | nmi_watchdog = NMI_NONE; |
| 191 | nmi_watchdog = NMI_LOCAL_APIC; | ||
| 192 | else | ||
| 193 | nmi_watchdog = NMI_IO_APIC; | ||
| 194 | } | 191 | } |
| 195 | 192 | ||
| 196 | static int endflag __initdata = 0; | 193 | static int endflag __initdata = 0; |