---

yaml --- r: 147711 b: refs/heads/master c: dc81081 h: refs/heads/master i: 147709: 4e36dc0 147707: 1f3d352 147703: 82e091d 147695: a2b1964 147679: 7d036f7 147647: 0b0be43 147583: 6f64f48 147455: cada1d8 v: v3
git-mirror · Jun 10, 2009 · fb128f4 · fb128f4
1 parent f82c690
commit fb128f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fecc8ac8496fce96069724f54daba8e7078b0082
+refs/heads/master: dc81081b2d9a6a9d64dad1bef1e5fc9fb660e53e
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -1407,7 +1407,10 @@ static int intel_pmu_init(void)
 	 * Install the hw-cache-events table:
 	 */
 	switch (boot_cpu_data.x86_model) {
-	case 17:
+	case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */
+	case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */
+	case 23: /* current 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */
+	case 29: /* six-core 45 nm xeon "Dunnington" */
 		memcpy(hw_cache_event_ids, core2_hw_cache_event_ids,
 		       sizeof(hw_cache_event_ids));