From b91ab6eda5fbb6903ac951d3db0c4576fbcda4ee Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 6 Aug 2010 09:00:32 +0200
Subject: [PATCH] --- yaml --- r: 209251 b: refs/heads/master c:
 e66b688c6456e6a607a1636e228fe0395d6c7214 h: refs/heads/master i:   209249:
 bfdb3f8c2ce5e5038c83de975bcf85a75eea0329   209247:
 2f7bfdfbdec9a7b9685080ec6aaac8f6a5a25b9c 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 26194c7b20a4..fbc50afc7987 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e7cf3a37ba6189fa7215555e8e760b400fc23b
+refs/heads/master: e66b688c6456e6a607a1636e228fe0395d6c7214
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 1ba67dc8006a..f6b48f6c5951 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -668,6 +668,7 @@ static int __init ppro_init(char **cpu_type)
 		*cpu_type = "i386/core_2";
 		break;
 	case 0x1a:
+	case 0x1e:
 	case 0x2e:
 		spec = &op_arch_perfmon_spec;
 		*cpu_type = "i386/core_i7";