projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee40fb2
)
perf/x86: Fix bogus kernel printk, again
author
Vegard Nossum
<
[email protected]
>
Sun, 10 Jul 2016 17:14:01 +0000
(19:14 +0200)
committer
Ingo Molnar
<
[email protected]
>
Sun, 10 Jul 2016 18:05:48 +0000
(20:05 +0200)
This showed up as "6Failed to access..." here.
Signed-off-by: Vegard Nossum <
[email protected]
>
Cc: Alexander Shishkin <
[email protected]
>
Cc: Arnaldo Carvalho de Melo <
[email protected]
>
Cc: Chen Yucong <
[email protected]
>
Cc: Jiri Olsa <
[email protected]
>
Cc: Linus Torvalds <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc: Thomas Gleixner <
[email protected]
>
Fixes: 1b74dde7c47c ("x86/cpu: Convert printk(KERN_<LEVEL> ...) to pr_<level>(...)")
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/x86/events/core.c
patch
|
blob
|
history
diff --git
a/arch/x86/events/core.c
b/arch/x86/events/core.c
index 26ced536005a2cec4c035aa518e32251a2fef00d..91eac39625beb1b85fb3651a1b1758d296779c9a 100644
(file)
--- 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",
+ pr
intk
("%sFailed to access perfctr msr (MSR %x is %Lx)\n",
boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,
reg, val_new);