| From c33f543d320843e1732534c3931da4bbd18e6c14 Mon Sep 17 00:00:00 2001 |
| From: Patrick Simmons <linuxrocks123@netscape.net> |
| Date: Wed, 8 Sep 2010 10:34:28 -0400 |
| Subject: oprofile: Add Support for Intel CPU Family 6 / Model 22 (Intel Celeron 540) |
| |
| From: Patrick Simmons <linuxrocks123@netscape.net> |
| |
| commit c33f543d320843e1732534c3931da4bbd18e6c14 upstream. |
| |
| This patch adds CPU type detection for the Intel Celeron 540, which is |
| part of the Core 2 family according to Wikipedia; the family and ID pair |
| is absent from the Volume 3B table referenced in the source code |
| comments. I have tested this patch on an Intel Celeron 540 machine |
| reporting itself as Family 6 Model 22, and OProfile runs on the machine |
| without issue. |
| |
| Spec: |
| |
| http://download.intel.com/design/mobile/SPECUPDT/317667.pdf |
| |
| Signed-off-by: Patrick Simmons <linuxrocks123@netscape.net> |
| Acked-by: Andi Kleen <ak@linux.intel.com> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Robert Richter <robert.richter@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/oprofile/nmi_int.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/arch/x86/oprofile/nmi_int.c |
| +++ b/arch/x86/oprofile/nmi_int.c |
| @@ -621,7 +621,9 @@ static int __init ppro_init(char **cpu_t |
| case 14: |
| *cpu_type = "i386/core"; |
| break; |
| - case 15: case 23: |
| + case 0x0f: |
| + case 0x16: |
| + case 0x17: |
| *cpu_type = "i386/core_2"; |
| break; |
| case 0x1a: |
