The patch titled
oprofile: don't set counter width from cpuid on core2
has been removed from the -mm tree. Its filename was
oprofile-dont-set-counter-width-from-cpuid-on-core2.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: oprofile: don't set counter width from cpuid on core2
From: Tim Blechmann <tim@xxxxxxxxxx>
Resetting the counter width of the performance counters on intel's core2,
breaks the delivery of NMIs, when running in x86_64 mode.
This should fix bug #12395:
http://bugzilla.kernel.org/show_bug.cgi?id=12395
Signed-off-by: Tim Blechmann <tim@xxxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/oprofile/op_model_ppro.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff -puN arch/x86/oprofile/op_model_ppro.c~oprofile-dont-set-counter-width-from-cpuid-on-core2 arch/x86/oprofile/op_model_ppro.c
--- a/arch/x86/oprofile/op_model_ppro.c~oprofile-dont-set-counter-width-from-cpuid-on-core2
+++ a/arch/x86/oprofile/op_model_ppro.c
@@ -78,10 +78,18 @@ static void ppro_setup_ctrs(struct op_ms
if (cpu_has_arch_perfmon) {
union cpuid10_eax eax;
eax.full = cpuid_eax(0xa);
+
+ /* 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)
+ goto clear_all_counters;
+
if (counter_width < eax.split.bit_width)
counter_width = eax.split.bit_width;
}
+clear_all_counters:
+
/* clear all counters */
for (i = 0 ; i < num_counters; ++i) {
if (unlikely(!CTRL_IS_RESERVED(msrs, i)))
_
Patches currently in -mm which might be from tim@xxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
