diff options
| author | Matt Redfearn <matt.redfearn@imgtec.com> | 2017-02-02 13:22:04 +0000 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2017-02-13 18:58:39 +0000 |
| commit | 4fb69afa767777360201a43725ddd7f7c64459bb (patch) | |
| tree | ac0d7b9b9b1d543d12d0623819930a3fb93275ca | |
| parent | c25f8064c1d5731a2ce5664def890140dcdd3e5c (diff) | |
| download | blackbird-obmc-linux-4fb69afa767777360201a43725ddd7f7c64459bb.tar.gz blackbird-obmc-linux-4fb69afa767777360201a43725ddd7f7c64459bb.zip | |
MIPS: sync-r4k: Fix KERN_CONT fallout
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>
| -rw-r--r-- | arch/mips/kernel/sync-r4k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c index 4472a7f98577..1df1160b6a47 100644 --- a/arch/mips/kernel/sync-r4k.c +++ b/arch/mips/kernel/sync-r4k.c @@ -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) |
