MIPS: sync-r4k: Fix KERN_CONT fallout
authorMatt Redfearn <matt.redfearn@imgtec.com>
Thu, 2 Feb 2017 13:22:04 +0000 (13:22 +0000)
committerJames Hogan <james.hogan@imgtec.com>
Mon, 13 Feb 2017 18:58:39 +0000 (18:58 +0000)
Since commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
continuation lines") the output of counter synchornisation has been
split across lines:
[ 0.665181] Synchronize counters for CPU 1:
[ 0.678578] done.

Fix this by using pr_cont, and replace printk with pr_info.

Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15195/
Signed-off-by: James Hogan <james.hogan@imgtec.com>
arch/mips/kernel/sync-r4k.c

index 4472a7f..1df1160 100644 (file)
@@ -29,7 +29,7 @@ void synchronise_count_master(int cpu)
        int i;
        unsigned long flags;
 
-       printk(KERN_INFO "Synchronize counters for CPU %u: ", cpu);
+       pr_info("Synchronize counters for CPU %u: ", cpu);
 
        local_irq_save(flags);
 
@@ -83,7 +83,7 @@ void synchronise_count_master(int cpu)
         * count registers were almost certainly out of sync
         * so no point in alarming people
         */
-       printk("done.\n");
+       pr_cont("done.\n");
 }
 
 void synchronise_count_slave(int cpu)