diff options
| author | Benjamin LaHaise <benjamin.c.lahaise@intel.com> | 2006-09-16 19:35:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-17 00:37:48 -0400 |
| commit | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (patch) | |
| tree | 48ed1289bbba1cb0220d3f17cecc9ec0a8cf5a29 | |
| parent | 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f (diff) | |
[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>
| -rw-r--r-- | arch/i386/oprofile/nmi_int.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c index c8c1df8ff2b4..5f8dc8a21bd7 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) | |||
| 337 | 337 | ||
| 338 | if (cpu_model == 14) | 338 | if (cpu_model == 14) |
| 339 | *cpu_type = "i386/core"; | 339 | *cpu_type = "i386/core"; |
| 340 | else if (cpu_model == 15) | ||
| 341 | *cpu_type = "i386/core_2"; | ||
| 340 | else if (cpu_model > 0xd) | 342 | else if (cpu_model > 0xd) |
| 341 | return 0; | 343 | return 0; |
| 342 | else if (cpu_model == 9) { | 344 | else if (cpu_model == 9) { |