diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
| commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
| tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /arch/i386/oprofile/nmi_int.c | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/oprofile/nmi_int.c')
| -rw-r--r-- | arch/i386/oprofile/nmi_int.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c index 1a2076ce6f6a..ec0fd3cfa774 100644 --- a/arch/i386/oprofile/nmi_int.c +++ b/arch/i386/oprofile/nmi_int.c | |||
| @@ -332,10 +332,11 @@ static int __init ppro_init(char ** cpu_type) | |||
| 332 | { | 332 | { |
| 333 | __u8 cpu_model = boot_cpu_data.x86_model; | 333 | __u8 cpu_model = boot_cpu_data.x86_model; |
| 334 | 334 | ||
| 335 | if (cpu_model > 0xd) | 335 | if (cpu_model == 14) |
| 336 | *cpu_type = "i386/core"; | ||
| 337 | else if (cpu_model > 0xd) | ||
| 336 | return 0; | 338 | return 0; |
| 337 | 339 | else if (cpu_model == 9) { | |
| 338 | if (cpu_model == 9) { | ||
| 339 | *cpu_type = "i386/p6_mobile"; | 340 | *cpu_type = "i386/p6_mobile"; |
| 340 | } else if (cpu_model > 5) { | 341 | } else if (cpu_model > 5) { |
| 341 | *cpu_type = "i386/piii"; | 342 | *cpu_type = "i386/piii"; |