Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: oprofile: don't set counter width from cpuid on Core2
x86: fix init_memory_mapping() to handle small ranges
+14
-2
+2
arch/x86/mm/init_64.c
+2
arch/x86/mm/init_64.c
···
714
714
pos = start_pfn << PAGE_SHIFT;
715
715
end_pfn = ((pos + (PMD_SIZE - 1)) >> PMD_SHIFT)
716
716
<< (PMD_SHIFT - PAGE_SHIFT);
717
+
if (end_pfn > (end >> PAGE_SHIFT))
718
+
end_pfn = end >> PAGE_SHIFT;
717
719
if (start_pfn < end_pfn) {
718
720
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
719
721
pos = end_pfn << PAGE_SHIFT;
+12
-2
arch/x86/oprofile/op_model_ppro.c
+12
-2
arch/x86/oprofile/op_model_ppro.c
···
78
78
if (cpu_has_arch_perfmon) {
79
79
union cpuid10_eax eax;
80
80
eax.full = cpuid_eax(0xa);
81
-
if (counter_width < eax.split.bit_width)
82
-
counter_width = eax.split.bit_width;
81
+
82
+
/*
83
+
* For Core2 (family 6, model 15), don't reset the
84
+
* counter width:
85
+
*/
86
+
if (!(eax.split.version_id == 0 &&
87
+
current_cpu_data.x86 == 6 &&
88
+
current_cpu_data.x86_model == 15)) {
89
+
90
+
if (counter_width < eax.split.bit_width)
91
+
counter_width = eax.split.bit_width;
92
+
}
83
93
}
84
94
85
95
/* clear all counters */