* [PATCH] perf: Fix bogus kernel printk, again
@ 2016-07-10 17:14 Vegard Nossum
2016-07-10 18:17 ` [tip:perf/urgent] perf/x86: " tip-bot for Vegard Nossum
0 siblings, 1 reply; 2+ messages in thread
From: Vegard Nossum @ 2016-07-10 17:14 UTC (permalink / raw)
To: mingo; +Cc: peterz, linux-kernel, Vegard Nossum, Chen Yucong
This showed up as "6Failed to access..." here.
Fixes: 1b74dde7c47c ("x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)")
Cc: Chen Yucong <slaoub@gmail.com>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
---
arch/x86/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 33787ee..229d1ff 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -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);
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:perf/urgent] perf/x86: Fix bogus kernel printk, again
2016-07-10 17:14 [PATCH] perf: Fix bogus kernel printk, again Vegard Nossum
@ 2016-07-10 18:17 ` tip-bot for Vegard Nossum
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Vegard Nossum @ 2016-07-10 18:17 UTC (permalink / raw)
To: linux-tip-commits
Cc: vegard.nossum, linux-kernel, acme, torvalds, peterz, jolsa,
mingo, slaoub, alexander.shishkin, hpa, tglx
Commit-ID: eb019503569c8c701f1e9c70e848d99c6680839b
Gitweb: http://git.kernel.org/tip/eb019503569c8c701f1e9c70e848d99c6680839b
Author: Vegard Nossum <vegard.nossum@oracle.com>
AuthorDate: Sun, 10 Jul 2016 19:14:01 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 10 Jul 2016 20:05:48 +0200
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: 1b74dde7c47c ("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>
---
arch/x86/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 26ced53..91eac39 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-10 18:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-10 17:14 [PATCH] perf: Fix bogus kernel printk, again Vegard Nossum
2016-07-10 18:17 ` [tip:perf/urgent] perf/x86: " tip-bot for Vegard Nossum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®