i386/x86-64: Add core 2 to oprofile

From: Benjamin LaHaise <benjamin.c.lahaise@intel.com>

This patch adds the CPU identification needed by oprofile for Intel (r) 
Core (tm) 2 CPUs.

Signed-off-by: Benjamin LaHaise <benjamin.c.lahaise@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>

---
 arch/i386/oprofile/nmi_int.c |    2 ++
 1 files changed, 2 insertions(+)

Index: linux/arch/i386/oprofile/nmi_int.c
===================================================================
--- linux.orig/arch/i386/oprofile/nmi_int.c
+++ linux/arch/i386/oprofile/nmi_int.c
@@ -367,6 +367,8 @@ static int __init ppro_init(char ** cpu_
 
 	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) {