On Thu, Feb 02, 2017 at 01:22:04PM +0000, Matt Redfearn wrote:
> 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@xxxxxxxxxx>
Applied
Thanks
James
> ---
>
> arch/mips/kernel/sync-r4k.c | 4 ++--
> 1 file 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)
> --
> 2.7.4
>
>
Attachment:
signature.asc
Description: Digital signature
