Messages in this thread Patch in this message | | | Date | Thu, 20 Oct 2022 15:17:56 -0000 | From | "tip-bot2 for Maxim Levitsky" <> | Subject | [tip: x86/urgent] perf/x86/intel/lbr: Use setup_clear_cpu_cap() instead of clear_cpu_cap() |
| |
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: b329f5ddc9ce4b622d9c7aaf5c6df4de52caf91a Gitweb: https://git.kernel.org/tip/b329f5ddc9ce4b622d9c7aaf5c6df4de52caf91a Author: Maxim Levitsky <mlevitsk@redhat.com> AuthorDate: Mon, 18 Jul 2022 17:11:19 +03:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Thu, 20 Oct 2022 17:10:28 +02:00
perf/x86/intel/lbr: Use setup_clear_cpu_cap() instead of clear_cpu_cap()
clear_cpu_cap(&boot_cpu_data) is very similar to setup_clear_cpu_cap() except that the latter also sets a bit in 'cpu_caps_cleared' which later clears the same cap in secondary cpus, which is likely what is meant here.
Fixes: 47125db27e47 ("perf/x86/intel/lbr: Support Architectural LBR") Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Link: https://lkml.kernel.org/r/20220718141123.136106-2-mlevitsk@redhat.com --- arch/x86/events/intel/lbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index 4fce1a4..8259d72 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -1596,7 +1596,7 @@ void __init intel_pmu_arch_lbr_init(void) return; clear_arch_lbr: - clear_cpu_cap(&boot_cpu_data, X86_FEATURE_ARCH_LBR); + setup_clear_cpu_cap(X86_FEATURE_ARCH_LBR); } /**
| |