Merge remote-tracking branch 'regmap/for-next'

[karo-tx-linux.git] / arch / x86 / kernel / cpu / perf_event_intel_ds.c

diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 10602f0a438fdab19311ff63bdcf014d27d3596a..7c79261ed939da2a219c45342c00491b5c6151dc 100644 (file)
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -1325,13 +1325,13 @@ void __init intel_ds_init(void)
 
                switch (format) {
                case 0:
-                       printk(KERN_CONT "PEBS fmt0%c, ", pebs_type);
+                       pr_cont("PEBS fmt0%c, ", pebs_type);
                        x86_pmu.pebs_record_size = sizeof(struct pebs_record_core);
                        x86_pmu.drain_pebs = intel_pmu_drain_pebs_core;
                        break;
 
                case 1:
-                       printk(KERN_CONT "PEBS fmt1%c, ", pebs_type);
+                       pr_cont("PEBS fmt1%c, ", pebs_type);
                        x86_pmu.pebs_record_size = sizeof(struct pebs_record_nhm);
                        x86_pmu.drain_pebs = intel_pmu_drain_pebs_nhm;
                        break;
@@ -1351,7 +1351,7 @@ void __init intel_ds_init(void)
                        break;
 
                default:
-                       printk(KERN_CONT "no PEBS fmt%d%c, ", format, pebs_type);
+                       pr_cont("no PEBS fmt%d%c, ", format, pebs_type);
                        x86_pmu.pebs = 0;
                }
        }