From: "Andi Kleen" The NMI watchdog code did this incorrectly Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton --- 25-akpm/arch/x86_64/kernel/nmi.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86_64/kernel/nmi.c~x86_64-dont-assume-future-amd-cpus-have-k8-compatible arch/x86_64/kernel/nmi.c --- 25/arch/x86_64/kernel/nmi.c~x86_64-dont-assume-future-amd-cpus-have-k8-compatible Thu Apr 7 15:11:05 2005 +++ 25-akpm/arch/x86_64/kernel/nmi.c Thu Apr 7 15:11:05 2005 @@ -341,7 +341,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; _