[PATCH] perf: Fix bogus kernel printk, again

2016-07-10 Thread Vegard Nossum
This showed up as "6Failed to access..." here.

Fixes: 1b74dde7c47c ("x86/cpu: Convert printk(KERN_ ...) to 
pr_(...)")
Cc: Chen Yucong 
Signed-off-by: Vegard Nossum 
---
 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



[PATCH] perf: Fix bogus kernel printk, again

2016-07-10 Thread Vegard Nossum
This showed up as "6Failed to access..." here.

Fixes: 1b74dde7c47c ("x86/cpu: Convert printk(KERN_ ...) to 
pr_(...)")
Cc: Chen Yucong 
Signed-off-by: Vegard Nossum 
---
 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