From f8e9bae7fde7a738c45943d5d4d1ca06ec8ec49b Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 16 Apr 2005 15:25:07 -0700
Subject: [PATCH] --- yaml --- r: 88 b: refs/heads/master c:
 72e76be2fedb4db320a4855d870f731c1242a9d3 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86_64/kernel/nmi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 099effed094f..12ebe8400b77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a848f632f86f1602094e6172cdc05c048042d7a
+refs/heads/master: 72e76be2fedb4db320a4855d870f731c1242a9d3
diff --git a/trunk/arch/x86_64/kernel/nmi.c b/trunk/arch/x86_64/kernel/nmi.c
index d9867de6a626..6ec5217f4b73 100644
--- a/trunk/arch/x86_64/kernel/nmi.c
+++ b/trunk/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;