x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>

Use a more current logging style:

 - Bare printks should have a KERN_<LEVEL> for consistency's sake
 - Add pr_fmt where appropriate
 - Neaten some macro definitions
 - Convert some Ok output to OK
 - Use "%s: ", __func__ in pr_fmt for summit
 - Convert some printks to pr_<level>

Message output is not identical in all cases.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: levinsasha928@gmail.com
Link: http://lkml.kernel.org/r/1337655007.24226.10.camel@joe2Laptop
[ merged two similar patches, tidied up the changelog ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 166546ec6aef..9e3f5d6e3d20 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -5,6 +5,8 @@
  * among events on a single PMU.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -1000,7 +1002,7 @@ static void intel_pmu_reset(void)
 
         local_irq_save(flags);
 
-        printk("clearing PMU state on CPU#%d\n", smp_processor_id());
+        pr_info("clearing PMU state on CPU#%d\n", smp_processor_id());
 
         for (idx = 0; idx < x86_pmu.num_counters; idx++) {
                 checking_wrmsrl(x86_pmu_config_addr(idx), 0ull);
@@ -1638,14 +1640,14 @@ static __init void intel_clovertown_quirk(void)
          * But taken together it might just make sense to not enable PEBS on
          * these chips.
          */
-        printk(KERN_WARNING "PEBS disabled due to CPU errata.\n");
+        pr_warn("PEBS disabled due to CPU errata\n");
         x86_pmu.pebs = 0;
         x86_pmu.pebs_constraints = NULL;
 }
 
 static __init void intel_sandybridge_quirk(void)
 {
-        printk(KERN_WARNING "PEBS disabled due to CPU errata.\n");
+        pr_warn("PEBS disabled due to CPU errata\n");
         x86_pmu.pebs = 0;
         x86_pmu.pebs_constraints = NULL;
 }
@@ -1667,8 +1669,8 @@ static __init void intel_arch_events_quirk(void)
         /* disable event that reported as not presend by cpuid */
         for_each_set_bit(bit, x86_pmu.events_mask, ARRAY_SIZE(intel_arch_events_map)) {
                 intel_perfmon_event_map[intel_arch_events_map[bit].id] = 0;
-                printk(KERN_WARNING "CPUID marked event: \'%s\' unavailable\n",
-                                intel_arch_events_map[bit].name);
+                pr_warn("CPUID marked event: \'%s\' unavailable\n",
+                        intel_arch_events_map[bit].name);
         }
 }
 
@@ -1687,7 +1689,7 @@ static __init void intel_nehalem_quirk(void)
                 intel_perfmon_event_map[PERF_COUNT_HW_BRANCH_MISSES] = 0x7f89;
                 ebx.split.no_branch_misses_retired = 0;
                 x86_pmu.events_maskl = ebx.full;
-                printk(KERN_INFO "CPU erratum AAJ80 worked around\n");
+                pr_info("CPU erratum AAJ80 worked around\n");
         }
 }