Commit eb019503 authored Jul 10, 2016 by Vegard Nossum Committed by Ingo Molnar Jul 10, 2016

perf/x86: Fix bogus kernel printk, again



This showed up as "6Failed to access..." here.

Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Chen Yucong <slaoub@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 1b74dde7 ("x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)")
Link: http://lkml.kernel.org/r/1468170841-17045-1-git-send-email-vegard.nossum@oracle.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent ee40fb29

arch/x86/events/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -263,7 +263,7 @@ static bool check_hw_exists(void)

		msr_fail:
		pr_cont("Broken PMU hardware detected, using software events only.\n");
		pr_info("%sFailed to access perfctr msr (MSR %x is %Lx)\n",
		printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",
		boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,
		reg, val_new);