Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / x86 / events / core.c

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index fad9788..d0efb5c 100644 (file)
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -263,10 +263,13 @@ static bool check_hw_exists(void)
        return true;
 
 msr_fail:
-       pr_cont("Broken PMU hardware detected, using software events only.\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);
+       if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
+               pr_cont("PMU not available due to virtualization, using software events only.\n");
+       } else {
+               pr_cont("Broken PMU hardware detected, using software events only.\n");
+               pr_err("Failed to access perfctr msr (MSR %x is %Lx)\n",
+                      reg, val_new);
+       }
 
        return false;
 }