diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /arch/i386/oprofile/nmi_int.c | |
| parent | fea63e38013ec628ab3f7fddc4c2148064b7910a (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/oprofile/nmi_int.c')
| -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) { |