Commit 72e76be2 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

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

The NMI watchdog code did this incorrectly
Signed-off-by: default avatarAndi Kleen <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 3a848f63
......@@ -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)
if (strstr(boot_cpu_data.x86_model_id, "Screwdriver"))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment