---

yaml --- r: 189632 b: refs/heads/master c: 134fbad h: refs/heads/master v: v3
git-mirror · Apr 6, 2010 · e232448 · e232448
1 parent 772f4b2
commit e232448
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c40041f75a202ed6a3b38143b823cb80f6d6b7c
+refs/heads/master: 134fbadf028a5977a1b06b0253d3ee33e6f0c642
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel.c b/trunk/arch/x86/kernel/cpu/perf_event_intel.c
@@ -936,6 +936,7 @@ static __init int intel_pmu_init(void)
 
 	case 26: /* 45 nm nehalem, "Bloomfield" */
 	case 30: /* 45 nm nehalem, "Lynnfield" */
+	case 46: /* 45 nm nehalem-ex, "Beckton" */
 		memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
 		       sizeof(hw_cache_event_ids));