---

yaml --- r: 180081 b: refs/heads/master c: e83e452 h: refs/heads/master i: 180079: 2c89e95 v: v3
git-mirror · Jan 25, 2010 · 762236c · 762236c
1 parent 9907aa9
commit 762236c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8cc108f4fab42b380c6b3f3356f99e8dd5372e2
+refs/heads/master: e83e452b0692c9c13372540deb88a77d4ae2553d
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
@@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type)
 	case 15: case 23:
 		*cpu_type = "i386/core_2";
 		break;
+	case 0x2e:
 	case 26:
 		spec = &op_arch_perfmon_spec;
 		*cpu_type = "i386/core_i7";