---

yaml --- r: 33947 b: refs/heads/master c: f04b92e h: refs/heads/master i: 33945: cb74743 33943: 8c26a51 v: v3
git-mirror · Sep 17, 2006 · bfaf410 · bfaf410
1 parent 6fbe92b
commit bfaf410
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f
+refs/heads/master: f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a
diff --git a/trunk/arch/i386/oprofile/nmi_int.c b/trunk/arch/i386/oprofile/nmi_int.c
@@ -337,6 +337,8 @@ static int __init ppro_init(char ** cpu_type)
 
 	if (cpu_model == 14)
 		*cpu_type = "i386/core";
+	else if (cpu_model == 15)
+		*cpu_type = "i386/core_2";
 	else if (cpu_model > 0xd)
 		return 0;
 	else if (cpu_model == 9) {