x86 fixes
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Tim Blechmann (1):
x86: oprofile: don't set counter width from cpuid on Core2
Yinghai Lu (1):
x86: fix init_memory_mapping() to handle small ranges
arch/x86/mm/init_64.c | 2 ++ arch/x86/oprofile/op_model_ppro.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-)
arch/x86/mm/init_64.c +2 -0
@@ -714,6 +714,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, pos = start_pfn <<PAGE_SHIFT ; end_pfn = ((pos + (PMD_SIZE -1 )) >>PMD_SHIFT ) << (PMD_SHIFT -PAGE_SHIFT ); +if (end_pfn > (end >>PAGE_SHIFT )) + end_pfn = end >>PAGE_SHIFT ;if (start_pfn < end_pfn) { nr_range =save_mr (mr, nr_range, start_pfn, end_pfn,0 ); pos = end_pfn <<PAGE_SHIFT ;
arch/x86/oprofile/op_model_ppro.c +12 -2
@@ -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 */