The following commit has been merged into the perf/core branch of tip: Commit-ID: 8e356858be2989355aafcc96af541fedf9fb486f Gitweb: https://git.kernel.org/tip/8e356858be2989355aafcc96af541fedf9fb486f Author: Rafael Mendonca <rafaelmendsr@xxxxxxxxx> AuthorDate: Fri, 28 Oct 2022 17:30:05 -03:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Tue, 15 Nov 2022 22:30:11 +01:00 perf/x86: Remove unused variable 'cpu_type' Since the removal of function x86_pmu_update_cpu_context() by commit 983bd8543b5a ("perf: Rewrite core context handling"), there is no need to query the type of the hybrid CPU inside function init_hw_perf_events(). Fixes: 983bd8543b5a ("perf: Rewrite core context handling") Signed-off-by: Rafael Mendonca <rafaelmendsr@xxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20221028203006.976831-1-rafaelmendsr@xxxxxxxxx --- arch/x86/events/core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 337a99a..85a63a4 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2161,13 +2161,9 @@ static int __init init_hw_perf_events(void) if (err) goto out2; } else { - u8 cpu_type = get_this_hybrid_cpu_type(); struct x86_hybrid_pmu *hybrid_pmu; int i, j; - if (!cpu_type && x86_pmu.get_hybrid_cpu_type) - cpu_type = x86_pmu.get_hybrid_cpu_type(); - for (i = 0; i < x86_pmu.num_hybrid_pmus; i++) { hybrid_pmu = &x86_pmu.hybrid_pmu[i];