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

Commit 65d71fe1 authored by Peter Zijlstra (Intel)'s avatar Peter Zijlstra (Intel) Committed by Ingo Molnar
Browse files

perf: Fix bogus kernel printk 



Andy spotted the fail in what was intended as a conditional printk level.

Reported-by: default avatarAndy Lutomirski <luto@amacapital.net>
Fixes: cc6cd47e ("perf/x86: Tone down kernel messages when the PMU check fails in a virtual environment")
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20141007124757.GH19379@twins.programming.kicks-ass.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e53f6124

arch/x86/kernel/cpu/perf_event.c

+3 −2
Original line number Diff line number Diff line
@@ -243,8 +243,9 @@ static bool check_hw_exists(void) 


msr_fail:

	printk(KERN_CONT "Broken PMU hardware detected, using software events only.\n");

	printk(boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR

	       "Failed to access perfctr msr (MSR %x is %Lx)\n", reg, val_new);

	printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",

		boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,

		reg, val_new);



	return false;

}