From 80181c5b60e05eafdd973dfec594dc144550f21e Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 27 Apr 2009 17:44:13 +0200
Subject: [PATCH] --- yaml --- r: 145970 b: refs/heads/master c:
 6adf406f0a0eaf37251018d15f51e93f5b538ee6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 08786d4ff201..58a83bf9d69a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f3d7b60691993d8d368d8dd7d5d85871d41e8f5
+refs/heads/master: 6adf406f0a0eaf37251018d15f51e93f5b538ee6
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index f472c0c48a3e..3308147182ae 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -417,6 +417,13 @@ static int __init ppro_init(char **cpu_type)
 	case 15: case 23:
 		*cpu_type = "i386/core_2";
 		break;
+	case 26:
+		arch_perfmon_setup_counters();
+		*cpu_type = "i386/core_i7";
+		break;
+	case 28:
+		*cpu_type = "i386/atom";
+		break;
 	default:
 		/* Unknown */
 		return 0;