---

yaml --- r: 169949 b: refs/heads/master c: 7d1849a h: refs/heads/master i: 169947: 639c38f v: v3
git-mirror · Dec 3, 2009 · 9b155fe · 9b155fe
1 parent c1a5499
commit 9b155fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;