---

yaml --- r: 218654 b: refs/heads/master c: e634147 h: refs/heads/master v: v3
git-mirror · Oct 15, 2010 · e4bfac8 · e4bfac8
1 parent 196c158
commit e4bfac8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;
 		}