Messages in this thread Patch in this message | | | From | Andi Kleen <> | Subject | [PATCH 04/11] x86, perf: Use new ht_on flag in HT leak workaround | Date | Tue, 22 Mar 2016 16:08:50 -0700 |
| |
From: Andi Kleen <ak@linux.intel.com>
Now that we have a convenient ht_on flag in x86_pmu use it to detect the HT workarounds for older CPUs.
Signed-off-by: Andi Kleen <ak@linux.intel.com> --- arch/x86/events/intel/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index ca693b3..d63ddb0 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3854,16 +3854,14 @@ __init int intel_pmu_init(void) */ static __init int fixup_ht_bug(void) { - int cpu = smp_processor_id(); - int w, c; + int c; /* * problem not present on this CPU model, nothing to do */ if (!(x86_pmu.flags & PMU_FL_EXCL_ENABLED)) return 0; - w = cpumask_weight(topology_sibling_cpumask(cpu)); - if (w > 1) { + if (x86_pmu.ht_on) { pr_info("PMU erratum BJ122, BV98, HSD29 worked around, HT is on\n"); return 0; } -- 2.5.5
| |