Skip to content

Commit

Permalink
[PATCH] x86_64: Don't assume future AMD CPUs have K8 compatible perfo…
Browse files Browse the repository at this point in the history
…rmance 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>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Apr 16, 2005
1 parent 3a848f6 commit 72e76be
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86_64/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 72e76be

Please sign in to comment.