From: Andi Kleen <ak@suse.de>
Date: Sat, 16 Apr 2005 22:25:07 +0000 (-0700)
Subject: [PATCH] x86_64: Don't assume future AMD CPUs have K8 compatible performance counters
X-Git-Tag: v2.6.12-rc3~158
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72e76be2fedb4db320a4855d870f731c1242a9d3;p=~emulex%2Finfiniband.git

[PATCH] x86_64: Don't assume future AMD CPUs have K8 compatible performance counters

The NMI watchdog code did this incorrectly

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index d9867de6a62..6ec5217f4b7 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -336,7 +336,7 @@ void setup_apic_nmi_watchdog(void)
 {
 	switch (boot_cpu_data.x86_vendor) {
 	case X86_VENDOR_AMD:
-		if (boot_cpu_data.x86 < 6)
+		if (boot_cpu_data.x86 != 15)
 			return;
 		if (strstr(boot_cpu_data.x86_model_id, "Screwdriver"))
 			return;