commit 977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Jan 18 14:06:08 2008 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Jan 18 14:06:08 2008 -0800
tree 6b030df34c579fbf3717d2d258c16aa803947874
parent 84f7466ee20cc094aa38617abfa2f3834871f054
parent e107ebe0e4a11b821d76ad2c3010c6a6244bd930

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: add support for the latest Intel processors to Oprofile

arch/x86/oprofile/nmi_int.c

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 2d0eeac..944bbcd 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -380,7 +380,7 @@
 
 	if (cpu_model == 14)
 		*cpu_type = "i386/core";
-	else if (cpu_model == 15)
+	else if (cpu_model == 15 || cpu_model == 23)
 		*cpu_type = "i386/core_2";
 	else if (cpu_model > 0xd)
 		return 0;