提交 65d71fe1 编写于 作者: P Peter Zijlstra (Intel) 提交者: Ingo Molnar

perf: Fix bogus kernel printk

Andy spotted the fail in what was intended as a conditional printk level.
Reported-by: NAndy Lutomirski <luto@amacapital.net>
Fixes: cc6cd47e ("perf/x86: Tone down kernel messages when the PMU check fails in a virtual environment")
Signed-off-by: NPeter 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.netSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 e53f6124
...@@ -243,8 +243,9 @@ static bool check_hw_exists(void) ...@@ -243,8 +243,9 @@ static bool check_hw_exists(void)
msr_fail: msr_fail:
printk(KERN_CONT "Broken PMU hardware detected, using software events only.\n"); printk(KERN_CONT "Broken PMU hardware detected, using software events only.\n");
printk(boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",
"Failed to access perfctr msr (MSR %x is %Lx)\n", reg, val_new); boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,
reg, val_new);
return false; return false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册