diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-01 14:39:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-01 14:39:31 +1000 |
| commit | 1b1a3346540ebea687ee41d5bcddd3856a45f86f (patch) | |
| tree | bd26f200ff85675288d1cefb6cc77d76cc3293ff | |
| parent | 74b7fdb370e69ec6bb0bcc78818d988ba58b9854 (diff) | |
| parent | 45c34e05c4e3d36e7c44e790241ea11a1d90d54e (diff) | |
Merge remote branch 'oprofile/for-next'
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index b28d2f1253bb..1ba67dc8006a 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -634,6 +634,18 @@ static int __init ppro_init(char **cpu_type) if (force_arch_perfmon && cpu_has_arch_perfmon) return 0; + /* + * Documentation on identifying Intel processors by CPU family + * and model can be found in the Intel Software Developer's + * Manuals (SDM): + * + * http://www.intel.com/products/processor/manuals/ + * + * As of May 2010 the documentation for this was in the: + * "Intel 64 and IA-32 Architectures Software Developer's + * Manual Volume 3B: System Programming Guide", "Table B-1 + * CPUID Signature Values of DisplayFamily_DisplayModel". + */ switch (cpu_model) { case 0 ... 2: *cpu_type = "i386/ppro"; @@ -655,12 +667,12 @@ static int __init ppro_init(char **cpu_type) case 15: case 23: *cpu_type = "i386/core_2"; break; + case 0x1a: case 0x2e: - case 26: spec = &op_arch_perfmon_spec; *cpu_type = "i386/core_i7"; break; - case 28: + case 0x1c: *cpu_type = "i386/atom"; break; default: |