From 762236cc28c26ed0e69d186aab09aee78a8c4031 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Thu, 21 Jan 2010 23:26:27 +0100
Subject: [PATCH] --- yaml --- r: 180081 b: refs/heads/master c:
 e83e452b0692c9c13372540deb88a77d4ae2553d h: refs/heads/master i:   180079:
 2c89e954ff90ae706b1eb5f97f1fb979633f3e97 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/oprofile/nmi_int.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 955776b3c68c..8fb4602107e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8cc108f4fab42b380c6b3f3356f99e8dd5372e2
+refs/heads/master: e83e452b0692c9c13372540deb88a77d4ae2553d
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 76d4f566adee..3347f696edc7 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type)
 	case 15: case 23:
 		*cpu_type = "i386/core_2";
 		break;
+	case 0x2e:
 	case 26:
 		spec = &op_arch_perfmon_spec;
 		*cpu_type = "i386/core_i7";