2017-04-26 17:41:20

by Joe Perches

[permalink] [raw]

Subject: [PATCH] ARM: Fix __show_regs output timestamps

---

Multiple line formats are not preferred as the second and
subsequent lines may not have timestamps.

Lacking timestamps makes reading the output a bit difficult.
This also makes arm/arm64 output more similar.

Previous:

[ 1514.093231] pc : [<bf79c304>] lr : [<bf79ced8>] psr: a00f0013
sp : ecdd7e20 ip : 00000000 fp : ffffffff

New:

[ 1514.093231] pc : [<bf79c304>] lr : [<bf79ced8>] psr: a00f0013
[ 1514.105316] sp : ecdd7e20 ip : 00000000 fp : ffffffff

Signed-off-by: Joe Perches <[email protected]>
---
arch/arm/kernel/process.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 939e8b58c59d..151cece4a293 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -123,10 +123,10 @@ void __show_regs(struct pt_regs *regs)

print_symbol("PC is at %s\n", instruction_pointer(regs));
print_symbol("LR is at %s\n", regs->ARM_lr);
- printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
- "sp : %08lx ip : %08lx fp : %08lx\n",
- regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
- regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
+ printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n",
+ regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr);
+ printk("sp : %08lx ip : %08lx fp : %08lx\n",
+ regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
printk("r10: %08lx r9 : %08lx r8 : %08lx\n",
regs->ARM_r10, regs->ARM_r9,
regs->ARM_r8);
--
2.10.0.rc2.1.g053435c

2017-04-26 20:18:57

by Andreas Kemnade

[permalink] [raw]

Subject: Re: [PATCH] ARM: Fix __show_regs output timestamps

---

On Wed, 26 Apr 2017 10:39:49 -0700
Joe Perches <[email protected]> wrote:

> Multiple line formats are not preferred as the second and
> subsequent lines may not have timestamps.
>
> Lacking timestamps makes reading the output a bit difficult.
> This also makes arm/arm64 output more similar.
>
> Previous:
>
> [ 1514.093231] pc : [<bf79c304>] lr : [<bf79ced8>] psr: a00f0013
> sp : ecdd7e20 ip : 00000000 fp : ffffffff
>
> New:
>
> [ 1514.093231] pc : [<bf79c304>] lr : [<bf79ced8>] psr: a00f0013
> [ 1514.105316] sp : ecdd7e20 ip : 00000000 fp : ffffffff
>
[ 102.669036] PC is at hso_start_net_device+0x50/0xc0 [hso]
[ 102.674835] LR is at hso_net_open+0x68/0x84 [hso]
[ 102.679809] pc : [<bf785304>] lr : [<bf785ed8>] psr: a00b0013
[ 102.686462] sp : ed047e20 ip : 00000000 fp : ffffffff

yes, the kernel oopses in a nicer way.

Tested-by: Andreas Kemnade <[email protected]>

Regards,
Andreas Kemnade

> Signed-off-by: Joe Perches <[email protected]>
> ---
> arch/arm/kernel/process.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
> index 939e8b58c59d..151cece4a293 100644
> --- a/arch/arm/kernel/process.c
> +++ b/arch/arm/kernel/process.c
> @@ -123,10 +123,10 @@ void __show_regs(struct pt_regs *regs)
>
> print_symbol("PC is at %s\n", instruction_pointer(regs));
> print_symbol("LR is at %s\n", regs->ARM_lr);
> - printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
> - "sp : %08lx ip : %08lx fp : %08lx\n",
> - regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
> - regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
> + printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n",
> + regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr);
> + printk("sp : %08lx ip : %08lx fp : %08lx\n",
> + regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
> printk("r10: %08lx r9 : %08lx r8 : %08lx\n",
> regs->ARM_r10, regs->ARM_r9,
> regs->ARM_r8);

---

Attachments:

(No filename) (819.00 B)
OpenPGP digital signature