From: James Hogan <james.hogan@imgtec.com>
To: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>, <linux-mips@linux-mips.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] MIPS: sync-r4k: Fix KERN_CONT fallout
Date: Sat, 11 Feb 2017 22:19:18 +0000 [thread overview]
Message-ID: <20170211221918.GH24226@jhogan-linux.le.imgtec.org> (raw)
In-Reply-To: <1486041724-19524-1-git-send-email-matt.redfearn@imgtec.com>
[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]
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@imgtec.com>
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 #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
prev parent reply other threads:[~2017-02-11 22:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-02 13:22 Matt Redfearn
2017-02-11 22:19 ` James Hogan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170211221918.GH24226@jhogan-linux.le.imgtec.org \
--to=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=matt.redfearn@imgtec.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®