From fb128f46dc04be4f1555bf0614ce5f1f07d3a7c1 Mon Sep 17 00:00:00 2001 From: Yong Wang Date: Wed, 10 Jun 2009 17:06:12 +0800 Subject: [PATCH] --- yaml --- r: 147711 b: refs/heads/master c: dc81081b2d9a6a9d64dad1bef1e5fc9fb660e53e h: refs/heads/master i: 147709: 4e36dc01ea0f58f07a1f9a2fb943a83d90c882e9 147707: 1f3d352eaf1c9521be678e52d82f82f1623b34c1 147703: 82e091dbe0db353c448bf3776557bf1d7e5cea40 147695: a2b1964ae0713a9686096b7c2eb4d9c88cb54860 147679: 7d036f72b5f1196102bfb988d051b508c25b7320 147647: 0b0be434b69ebdd6fce760b48b95a12eed1526ba 147583: 6f64f486b1a5efd12a8d4b3d065384ec13da5a8e 147455: cada1d8d5107b95ef6be094bd663490652adfd4e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_counter.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e40594eb202..ad101fd205cd 100644 --- 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 index 40978aac6e0f..49f258537cbf 100644 --- 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));