aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-04-16 15:25:07 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:07 -0700
commit72e76be2fedb4db320a4855d870f731c1242a9d3 (patch)
treee81ec1181cba1c29eaa898d3b474301b8dc2d298
parent3a848f632f86f1602094e6172cdc05c048042d7a (diff)
downloadkernel_samsung_smdk4412-72e76be2fedb4db320a4855d870f731c1242a9d3.tar.gz
kernel_samsung_smdk4412-72e76be2fedb4db320a4855d870f731c1242a9d3.tar.bz2
kernel_samsung_smdk4412-72e76be2fedb4db320a4855d870f731c1242a9d3.zip
[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>
-rw-r--r--arch/x86_64/kernel/nmi.c2
1 files changed, 1 insertions, 1 deletions
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;