lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.29-rc7' into perfcounters/core

Browse Source 
Conflicts:
	arch/x86/mm/iomap_32.c
This commit is contained in:
Ingo Molnar
2009-03-04 11:42:31 +01:00
parent a1ef58f442 fec6c6fec3
commit 8163d88c79
268 changed files with 3032 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/oprofile/op_model_ppro.c
View File

@@ -78,8 +78,18 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs)
if (cpu_has_arch_perfmon) {
union cpuid10_eax eax;
eax.full = cpuid_eax(0xa);
if (counter_width < eax.split.bit_width)
counter_width = eax.split.bit_width;
/*
* For Core2 (family 6, model 15), don't reset the
* counter width:
*/
if (!(eax.split.version_id == 0 &&
current_cpu_data.x86 == 6 &&
current_cpu_data.x86_model == 15)) {
if (counter_width < eax.split.bit_width)
counter_width = eax.split.bit_width;
}
}
/* clear all counters */