Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4078c444 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

perf_counter, x86: Update x86_pmu after WARN() 



The print out should read the value before changing the value.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4A487017.4090007@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c3043569

arch/x86/kernel/cpu/perf_counter.c

+2 −2
Original line number Diff line number Diff line
@@ -1496,17 +1496,17 @@ void __init init_hw_perf_counters(void) 
	pr_cont("%s PMU driver.\n", x86_pmu.name);



	if (x86_pmu.num_counters > X86_PMC_MAX_GENERIC) {

		x86_pmu.num_counters = X86_PMC_MAX_GENERIC;

		WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",

		     x86_pmu.num_counters, X86_PMC_MAX_GENERIC);

		x86_pmu.num_counters = X86_PMC_MAX_GENERIC;

	}

	perf_counter_mask = (1 << x86_pmu.num_counters) - 1;

	perf_max_counters = x86_pmu.num_counters;



	if (x86_pmu.num_counters_fixed > X86_PMC_MAX_FIXED) {

		x86_pmu.num_counters_fixed = X86_PMC_MAX_FIXED;

		WARN(1, KERN_ERR "hw perf counters fixed %d > max(%d), clipping!",

		     x86_pmu.num_counters_fixed, X86_PMC_MAX_FIXED);

		x86_pmu.num_counters_fixed = X86_PMC_MAX_FIXED;

	}



	perf_counter_mask |=