diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-18 17:06:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-18 17:06:08 -0500 |
| commit | 977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d (patch) | |
| tree | 6b030df34c579fbf3717d2d258c16aa803947874 | |
| parent | 84f7466ee20cc094aa38617abfa2f3834871f054 (diff) | |
| parent | e107ebe0e4a11b821d76ad2c3010c6a6244bd930 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: add support for the latest Intel processors to Oprofile
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 2d0eeac7251..944bbcdd2b8 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
| @@ -380,7 +380,7 @@ static int __init ppro_init(char ** cpu_type) | |||
| 380 | 380 | ||
| 381 | if (cpu_model == 14) | 381 | if (cpu_model == 14) |
| 382 | *cpu_type = "i386/core"; | 382 | *cpu_type = "i386/core"; |
| 383 | else if (cpu_model == 15) | 383 | else if (cpu_model == 15 || cpu_model == 23) |
| 384 | *cpu_type = "i386/core_2"; | 384 | *cpu_type = "i386/core_2"; |
| 385 | else if (cpu_model > 0xd) | 385 | else if (cpu_model > 0xd) |
| 386 | return 0; | 386 | return 0; |