From 75bc2d21645db35d9f1cf57daa90b89bae7e7c04 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Sun, 30 Nov 2008 15:39:10 -0500 Subject: [PATCH] --- yaml --- r: 119697 b: refs/heads/master c: 3d337c653c94be50f11a45fb14a2afa8a8a1a618 h: refs/heads/master i: 119695: 3d0d911c965a77299b5e611c9f1c55cc4d515c11 v: v3 --- [refs] | 2 +- trunk/arch/x86/oprofile/nmi_int.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74ef537218a1..6bf6fea9d729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ea84ad77d635bdb76c9a08f44f21a9af98359ee +refs/heads/master: 3d337c653c94be50f11a45fb14a2afa8a8a1a618 diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c index 022cd41ea9b4..202864ad49a7 100644 --- a/trunk/arch/x86/oprofile/nmi_int.c +++ b/trunk/arch/x86/oprofile/nmi_int.c @@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type) *cpu_type = "i386/pii"; break; case 6 ... 8: + case 10 ... 11: *cpu_type = "i386/piii"; break; case 9: + case 13: *cpu_type = "i386/p6_mobile"; break; - case 10 ... 13: - *cpu_type = "i386/p6"; - break; case 14: *cpu_type = "i386/core"; break;