From 77541ff56d75eb085748d89af1ebc1e407af29d4 Mon Sep 17 00:00:00 2001
From: Benjamin LaHaise <bcrl@kvack.org>
Date: Mon, 15 May 2006 09:44:24 -0700
Subject: [PATCH] --- yaml --- r: 26718 b: refs/heads/master c:
 64471ebe534dc6cedd72849b2324b52cb5249eb9 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/i386/oprofile/nmi_int.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 249e93ef14d8..7c690d2094e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6333fd4ddf7a583480017f535b9ea53c116ab81
+refs/heads/master: 64471ebe534dc6cedd72849b2324b52cb5249eb9
diff --git a/trunk/arch/i386/oprofile/nmi_int.c b/trunk/arch/i386/oprofile/nmi_int.c
index 1a2076ce6f6a..ec0fd3cfa774 100644
--- a/trunk/arch/i386/oprofile/nmi_int.c
+++ b/trunk/arch/i386/oprofile/nmi_int.c
@@ -332,10 +332,11 @@ static int __init ppro_init(char ** cpu_type)
 {
 	__u8 cpu_model = boot_cpu_data.x86_model;
 
-	if (cpu_model > 0xd)
+	if (cpu_model == 14)
+		*cpu_type = "i386/core";
+	else if (cpu_model > 0xd)
 		return 0;
-
-	if (cpu_model == 9) {
+	else if (cpu_model == 9) {
 		*cpu_type = "i386/p6_mobile";
 	} else if (cpu_model > 5) {
 		*cpu_type = "i386/piii";