From e4bfac85e007bb14333edf4b60ab470006d34377 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Thu, 26 Aug 2010 12:30:17 +0200
Subject: [PATCH] --- yaml --- r: 218654 b: refs/heads/master c:
 e63414740e15b4e2dc54c63fb9ea501b257fb0b5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1507ad2f9659..254b73a5b9a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3acbf0849bcbb639fde53dc627e3b55a4c6429d2
+refs/heads/master: e63414740e15b4e2dc54c63fb9ea501b257fb0b5
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 0b0d1d628207..4e8baad36d37 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -729,6 +729,9 @@ int __init op_nmi_init(struct oprofile_operations *ops)
 		case 0x12:
 			cpu_type = "x86-64/family12h";
 			break;
+		case 0x14:
+			cpu_type = "x86-64/family14h";
+			break;
 		default:
 			return -ENODEV;
 		}