diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-03-27 23:37:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-04 18:36:45 +0200 |
| commit | 4f14bdef41e599e218d71e3d0abf339d65e9b480 (patch) | |
| tree | ed7909975fa061b798b9b302a1ec6b79c0ab3bc8 | |
| parent | e315c121a858499d84dc88c499046b9f10bb61ec (diff) | |
| download | linux-4f14bdef41e599e218d71e3d0abf339d65e9b480.tar.gz linux-4f14bdef41e599e218d71e3d0abf339d65e9b480.tar.bz2 linux-4f14bdef41e599e218d71e3d0abf339d65e9b480.zip | |
x86: fix nmi_watchdog=2 on Pentium-D CPUs
implement nmi_watchdog=2 on this class of CPUs:
cpu family : 15
model : 6
model name : Intel(R) Pentium(R) D CPU 3.00GHz
the watchdog's ->setup() method is safe anyway, so if the CPU
cannot support it we'll bail out safely.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/cpu/perfctr-watchdog.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c index 9b838324b818..19a359472ae1 100644 --- a/arch/x86/kernel/cpu/perfctr-watchdog.c +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c @@ -652,9 +652,6 @@ static void probe_nmi_watchdog(void) wd_ops = &p6_wd_ops; break; case 15: - if (boot_cpu_data.x86_model > 0x4) - return; - wd_ops = &p4_wd_ops; break; default: |