[PATCH] i386/x86-64: Add core 2 to oprofile

Add 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>
Cc: "Arun Sharma" <aruns@google.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Benjamin LaHaise 2006-09-16 16:35:46 -07:00 committed by Linus Torvalds
parent 35e4ddfc86
commit f04b92e97d

View File

@ -337,6 +337,8 @@ static int __init ppro_init(char ** cpu_type)
if (cpu_model == 14) if (cpu_model == 14)
*cpu_type = "i386/core"; *cpu_type = "i386/core";
else if (cpu_model == 15)
*cpu_type = "i386/core_2";
else if (cpu_model > 0xd) else if (cpu_model > 0xd)
return 0; return 0;
else if (cpu_model == 9) { else if (cpu_model == 9) {