Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/rric/oprofile into perf/urgent
git-mirror · Sep 16, 2010 · 0d2b549 · 0d2b549
2 parents 05ed160 + c33f543
commit 0d2b549
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
@@ -671,7 +671,9 @@ static int __init ppro_init(char **cpu_type)
 	case 14:
 		*cpu_type = "i386/core";
 		break;
-	case 15: case 23:
+	case 0x0f:
+	case 0x16:
+	case 0x17:
 		*cpu_type = "i386/core_2";
 		break;
 	case 0x1a: