From f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a Mon Sep 17 00:00:00 2001 From: Benjamin LaHaise Date: Sat, 16 Sep 2006 16:35:46 -0700 Subject: [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 Signed-off-by: Andi Kleen Cc: "Arun Sharma" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/i386/oprofile/nmi_int.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/i386/oprofile/nmi_int.c') diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c index c8c1df8ff2b..5f8dc8a21bd 100644 --- a/arch/i386/oprofile/nmi_int.c +++ b/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) { -- cgit v1.2.3-70-g09d2