[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 d9867de6a6263bfbc8843e6798bef6f44a1c7eec..6ec5217f4b73291fdf515a9d8b218452fd55acb5 100644 (file)
--- 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;