From 9b155fe005db8e1e48667305f49cf1413a40ecf7 Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikpe@it.uu.se>
Date: Thu, 3 Dec 2009 15:52:44 +0100
Subject: [PATCH] --- yaml --- r: 169949 b: refs/heads/master c:
 7d1849aff6687a135a8da3a75e32a00e3137a5e2 h: refs/heads/master i:   169947:
 639c38f3b6a3cb836415ebbc4356842b9e8823fc v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4b6e8c7dc31a..e19749de9568 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d20792e85187b27ae3d1b76678a2dd7025e8bc2
+refs/heads/master: 7d1849aff6687a135a8da3a75e32a00e3137a5e2
diff --git a/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c b/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c
index fab786f60ed6..898df9719afb 100644
--- a/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -712,7 +712,7 @@ static void probe_nmi_watchdog(void)
 	switch (boot_cpu_data.x86_vendor) {
 	case X86_VENDOR_AMD:
 		if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&
-		    boot_cpu_data.x86 != 16)
+		    boot_cpu_data.x86 != 16 && boot_cpu_data.x86 != 17)
 			return;
 		wd_ops = &k7_wd_ops;
 		break;