[PATCH 1/2] parisc: avoid needless empty lines inside register dump

[PATCH 1/2] parisc: avoid needless empty lines inside register dump

[Rolf Eike Beer]

Date: Sat, 20 Jun 2020 23:03:51 +0200

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
 arch/parisc/kernel/traps.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 5400e23a77a1..e6a0bfdf5c26 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -80,7 +80,6 @@ static void print_gr(char *level, struct pt_regs *regs)
 	int i;
 	char buf[64];
 
-	printk("%s\n", level);
 	printk("%s     YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI\n", level);
 	printbinary(buf, regs->gr[0], 32);
 	printk("%sPSW: %s %s\n", level, buf, print_tainted());
@@ -105,11 +104,9 @@ static void print_fr(char *level, struct pt_regs *regs)
 		      "fldd 0(%1),%%fr0	\n\t"
 		      : "=m" (s) : "r" (&s) : "r0");
 
-	printk("%s\n", level);
 	printk("%s      VZOUICununcqcqcqcqcqcrmunTDVZOUI\n", level);
 	printbinary(buf, s.sw[0], 32);
-	printk("%sFPSR: %s\n", level, buf);
-	printk("%sFPER1: %08x\n", level, s.sw[1]);
+	printk("%sFPSR: %s FPER1: %08x\n", level, buf, s.sw[1]);
 
 	/* here we'll print fr0 again, tho it'll be meaningless */
 	for (i = 0; i < 32; i += 4)
@@ -137,7 +134,6 @@ void show_regs(struct pt_regs *regs)
 
 	cr30 = mfctl(30);
 	cr31 = mfctl(31);
-	printk("%s\n", level);
 	printk("%sIASQ: " RFMT " " RFMT " IAOQ: " RFMT " " RFMT "\n",
 	       level, regs->iasq[0], regs->iasq[1], regs->iaoq[0], regs->iaoq[1]);
 	printk("%s IIR: %08lx    ISR: " RFMT "  IOR: " RFMT "\n",
-- 
2.26.2

[PATCH 2/2] parisc: make the log level string for register dumps const

[Rolf Eike Beer]

Date: Mon, 22 Jun 2020 20:47:50 +0200

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
---
 arch/parisc/kernel/traps.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index e6a0bfdf5c26..8e46428be70a 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -75,7 +75,7 @@ static int printbinary(char *buf, unsigned long x, int nbits)
 		lvl, f, (x), (x+3), (r)[(x)+0], (r)[(x)+1],		\
 		(r)[(x)+2], (r)[(x)+3])
 
-static void print_gr(char *level, struct pt_regs *regs)
+static void print_gr(const char *level, struct pt_regs *regs)
 {
 	int i;
 	char buf[64];
@@ -88,7 +88,7 @@ static void print_gr(char *level, struct pt_regs *regs)
 		PRINTREGS(level, regs->gr, "r", RFMT, i);
 }
 
-static void print_fr(char *level, struct pt_regs *regs)
+static void print_fr(const char *level, struct pt_regs *regs)
 {
 	int i;
 	char buf[64];
@@ -116,7 +116,7 @@ static void print_fr(char *level, struct pt_regs *regs)
 void show_regs(struct pt_regs *regs)
 {
 	int i, user;
-	char *level;
+	const char *level;
 	unsigned long cr30, cr31;
 
 	user = user_mode(regs);
-- 
2.26.2

Re: [PATCH 1/2] parisc: avoid needless empty lines inside register dump

[Rolf Eike Beer]

[-- Attachment #1: Type: text/plain, Size: 46 bytes --]

> Date: Sat, 20 Jun 2020 23:03:51 +0200

Ping?

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [PATCH 1/2] parisc: avoid needless empty lines inside register dump

[Helge Deller]

On 22.06.20 20:51, Rolf Eike Beer wrote:
> Date: Sat, 20 Jun 2020 23:03:51 +0200
>
> Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>

Actually, I like those empty lines, because they mark a barrier
between the general registers vs. float registers vs. backtrace.

That said, I'd prefer to not apply this patch, but if more people
here on the list think it's better to remove those, I'm fine to take it.

Helge


> ---
>  arch/parisc/kernel/traps.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
> index 5400e23a77a1..e6a0bfdf5c26 100644
> --- a/arch/parisc/kernel/traps.c
> +++ b/arch/parisc/kernel/traps.c
> @@ -80,7 +80,6 @@ static void print_gr(char *level, struct pt_regs *regs)
>  	int i;
>  	char buf[64];
>
> -	printk("%s\n", level);
>  	printk("%s     YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI\n", level);
>  	printbinary(buf, regs->gr[0], 32);
>  	printk("%sPSW: %s %s\n", level, buf, print_tainted());
> @@ -105,11 +104,9 @@ static void print_fr(char *level, struct pt_regs *regs)
>  		      "fldd 0(%1),%%fr0	\n\t"
>  		      : "=m" (s) : "r" (&s) : "r0");
>
> -	printk("%s\n", level);
>  	printk("%s      VZOUICununcqcqcqcqcqcrmunTDVZOUI\n", level);
>  	printbinary(buf, s.sw[0], 32);
> -	printk("%sFPSR: %s\n", level, buf);
> -	printk("%sFPER1: %08x\n", level, s.sw[1]);
> +	printk("%sFPSR: %s FPER1: %08x\n", level, buf, s.sw[1]);
>
>  	/* here we'll print fr0 again, tho it'll be meaningless */
>  	for (i = 0; i < 32; i += 4)
> @@ -137,7 +134,6 @@ void show_regs(struct pt_regs *regs)
>
>  	cr30 = mfctl(30);
>  	cr31 = mfctl(31);
> -	printk("%s\n", level);
>  	printk("%sIASQ: " RFMT " " RFMT " IAOQ: " RFMT " " RFMT "\n",
>  	       level, regs->iasq[0], regs->iasq[1], regs->iaoq[0], regs->iaoq[1]);
>  	printk("%s IIR: %08lx    ISR: " RFMT "  IOR: " RFMT "\n",
>