From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 27 Mar 2008 22:37:58 +0000 (+0100)
Subject: x86: fix nmi_watchdog=2 on Pentium-D CPUs
X-Git-Tag: MMI-PSA29.97-13-9~35734^2~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f14bdef41e599e218d71e3d0abf339d65e9b480;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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: