x86: also allow disabling LAPIC NMI watchdog on newer CPUs

This complements c/s 9146:941897e98591, and also replaces a literal
zero with a proper manifest constant.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index 4e2cd53b7543185f8542e102d5221f022b7cbee3..92a141ecb85b191ace7170e147d12f9286443b6f 100644 (file)
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -175,15 +175,9 @@ static void disable_lapic_nmi_watchdog(void)
     case X86_VENDOR_INTEL:
         switch (boot_cpu_data.x86) {
         case 6:
-            if (boot_cpu_data.x86_model > 0xd)
-                break;
-
             wrmsr(MSR_P6_EVNTSEL0, 0, 0);
             break;
         case 15:
-            if (boot_cpu_data.x86_model > 0x4)
-                break;
-
             wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
             wrmsr(MSR_P4_CRU_ESCR0, 0, 0);
             break;
@@ -192,7 +186,7 @@ static void disable_lapic_nmi_watchdog(void)
     }
     nmi_active = -1;
     /* tell do_nmi() and others that we're not active any more */
-    nmi_watchdog = 0;
+    nmi_watchdog = NMI_NONE;
 }
 
 static void enable_lapic_nmi_watchdog(void)