oprofile: Add Support for Intel CPU Family 6 / Model 22 (Intel Celeron 540)
authorPatrick Simmons <linuxrocks123@netscape.net>
Wed, 8 Sep 2010 14:34:28 +0000 (10:34 -0400)
committerRobert Richter <robert.richter@amd.com>
Thu, 16 Sep 2010 10:35:56 +0000 (12:35 +0200)
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>
Cc: stable@kernel.org
Signed-off-by: Robert Richter <robert.richter@amd.com>
arch/x86/oprofile/nmi_int.c

index cfe4faabb0f6792aebfb8330dd55f02406b148dc..009b819f48d0a9fee5d3677e343056fe8d9f4c79 100644 (file)
@@ -671,7 +671,9 @@ static int __init ppro_init(char **cpu_type)
        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: