diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /arch/i386/kernel/nmi.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/i386/kernel/nmi.c')
| -rw-r--r-- | arch/i386/kernel/nmi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index a5e34d655965..1a6f8bb8881c 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
| @@ -310,13 +310,7 @@ static int __init setup_nmi_watchdog(char *str) | |||
| 310 | 310 | ||
| 311 | if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE)) | 311 | if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE)) |
| 312 | return 0; | 312 | return 0; |
| 313 | /* | 313 | |
| 314 | * If any other x86 CPU has a local APIC, then | ||
| 315 | * please test the NMI stuff there and send me the | ||
| 316 | * missing bits. Right now Intel P6/P4 and AMD K7 only. | ||
| 317 | */ | ||
| 318 | if ((nmi == NMI_LOCAL_APIC) && (nmi_known_cpu() == 0)) | ||
| 319 | return 0; /* no lapic support */ | ||
| 320 | nmi_watchdog = nmi; | 314 | nmi_watchdog = nmi; |
| 321 | return 1; | 315 | return 1; |
| 322 | } | 316 | } |