diff options
| author | Yong Wang <yong.y.wang@linux.intel.com> | 2009-06-10 17:06:12 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-10 13:04:43 +0200 |
| commit | dc81081b2d9a6a9d64dad1bef1e5fc9fb660e53e (patch) | |
| tree | c8b598dd256990e9ff766a8c530377dd4821da0f /arch | |
| parent | fecc8ac8496fce96069724f54daba8e7078b0082 (diff) | |
| download | linux-stable-dc81081b2d9a6a9d64dad1bef1e5fc9fb660e53e.tar.gz linux-stable-dc81081b2d9a6a9d64dad1bef1e5fc9fb660e53e.tar.bz2 linux-stable-dc81081b2d9a6a9d64dad1bef1e5fc9fb660e53e.zip | |
perf_counter/x86: Fix the model number of Intel Core2 processors
Fix the model number of Intel Core2 processors according to the
documentation: Intel Processor Identification with the CPUID
Instruction: http://www.intel.com/support/processors/sb/cs-009861.htm
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Also-Reported-by: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <20090610090612.GA26580@ywang-moblin2.bj.intel.com>
[ Added two more model numbers suggested by Arnd Bergmann ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_counter.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index 40978aac6e0f..49f258537cbf 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/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)); |