[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <19223.53436.931768.278021@pilspetsen.it.uu.se>
Date: Thu, 3 Dec 2009 15:52:44 +0100
From: Mikael Pettersson <mikpe@...uu.se>
To: x86@...nel.org
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH 2.6.32] x86: enable lapic nmi watchdog on AMD Family 11h
The x86 lapic nmi watchdog does not recognize AMD Family 11h,
resulting in:
NMI watchdog: CPU not supported
As far as I can see from available documentation (the BKDM),
family 11h looks identical to family 10h as far as the PMU
is concerned.
Extending the check to accept family 11h results in:
Testing NMI watchdog ... OK.
I've been running with this change on a Turion X2 Ultra ZM-82
laptop for a couple of weeks now without problems.
Signed-off-by: Mikael Pettersson <mikpe@...uu.se>
---
diff -rupN linux-2.6.32/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.x86-amd-fam11-nmi/arch/x86/kernel/cpu/perfctr-watchdog.c
--- linux-2.6.32/arch/x86/kernel/cpu/perfctr-watchdog.c 2009-12-03 12:38:32.000000000 +0100
+++ linux-2.6.32.x86-amd-fam11-nmi/arch/x86/kernel/cpu/perfctr-watchdog.c 2009-12-03 12:47:59.000000000 +0100
@@ -712,7 +712,7 @@ static void probe_nmi_watchdog(void)
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD:
if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&
- boot_cpu_data.x86 != 16)
+ boot_cpu_data.x86 != 16 && boot_cpu_data.x86 != 17)
return;
wd_ops = &k7_wd_ops;
break;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists