Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1572367 > unrolled thread

[PATCH] MIPS: sync-r4k: Fix KERN_CONT fallout

Back to article view | Back to linux.kernel

Contents

  [PATCH] MIPS: sync-r4k: Fix KERN_CONT fallout Matt Redfearn <matt.redfearn@imgtec.com> - 2017-02-02 14:40 +0100
    Re: [PATCH] MIPS: sync-r4k: Fix KERN_CONT fallout James Hogan <james.hogan@imgtec.com> - 2017-02-11 23:20 +0100

#1572367 — [PATCH] 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>
---

 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

[toc] | [next] | [standalone]

#1579127

[Multipart message — attachments visible in raw view] — view raw

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
> 
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web