Commit 21afcacb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rich Felker

sh: process: Fix broken lines in register dumps

Rejoin the broken lines by using pr_cont().
Convert the remaining printk() calls to pr_*() while at it.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent 0632a6d8
...@@ -30,34 +30,30 @@ ...@@ -30,34 +30,30 @@
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs * regs)
{ {
printk("\n"); pr_info("\n");
show_regs_print_info(KERN_DEFAULT); show_regs_print_info(KERN_DEFAULT);
printk("PC is at %pS\n", (void *)instruction_pointer(regs)); pr_info("PC is at %pS\n", (void *)instruction_pointer(regs));
printk("PR is at %pS\n", (void *)regs->pr); pr_info("PR is at %pS\n", (void *)regs->pr);
printk("PC : %08lx SP : %08lx SR : %08lx ", pr_info("PC : %08lx SP : %08lx SR : %08lx ", regs->pc,
regs->pc, regs->regs[15], regs->sr); regs->regs[15], regs->sr);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
printk("TEA : %08x\n", __raw_readl(MMU_TEA)); pr_cont("TEA : %08x\n", __raw_readl(MMU_TEA));
#else #else
printk("\n"); pr_cont("\n");
#endif #endif
printk("R0 : %08lx R1 : %08lx R2 : %08lx R3 : %08lx\n", pr_info("R0 : %08lx R1 : %08lx R2 : %08lx R3 : %08lx\n",
regs->regs[0],regs->regs[1], regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3]);
regs->regs[2],regs->regs[3]); pr_info("R4 : %08lx R5 : %08lx R6 : %08lx R7 : %08lx\n",
printk("R4 : %08lx R5 : %08lx R6 : %08lx R7 : %08lx\n", regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]);
regs->regs[4],regs->regs[5], pr_info("R8 : %08lx R9 : %08lx R10 : %08lx R11 : %08lx\n",
regs->regs[6],regs->regs[7]); regs->regs[8], regs->regs[9], regs->regs[10], regs->regs[11]);
printk("R8 : %08lx R9 : %08lx R10 : %08lx R11 : %08lx\n", pr_info("R12 : %08lx R13 : %08lx R14 : %08lx\n",
regs->regs[8],regs->regs[9], regs->regs[12], regs->regs[13], regs->regs[14]);
regs->regs[10],regs->regs[11]); pr_info("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
printk("R12 : %08lx R13 : %08lx R14 : %08lx\n", regs->mach, regs->macl, regs->gbr, regs->pr);
regs->regs[12],regs->regs[13],
regs->regs[14]);
printk("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
regs->mach, regs->macl, regs->gbr, regs->pr);
show_trace(NULL, (unsigned long *)regs->regs[15], regs, KERN_DEFAULT); show_trace(NULL, (unsigned long *)regs->regs[15], regs, KERN_DEFAULT);
show_code(regs); show_code(regs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment