Skip to content

Commit 21afcac

Browse files
geertuRich Felker
authored andcommitted
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: Geert Uytterhoeven <[email protected]> Tested-by: Guenter Roeck <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent 0632a6d commit 21afcac

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

arch/sh/kernel/process_32.c

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,30 @@
3030

3131
void show_regs(struct pt_regs * regs)
3232
{
33-
printk("\n");
33+
pr_info("\n");
3434
show_regs_print_info(KERN_DEFAULT);
3535

36-
printk("PC is at %pS\n", (void *)instruction_pointer(regs));
37-
printk("PR is at %pS\n", (void *)regs->pr);
36+
pr_info("PC is at %pS\n", (void *)instruction_pointer(regs));
37+
pr_info("PR is at %pS\n", (void *)regs->pr);
3838

39-
printk("PC : %08lx SP : %08lx SR : %08lx ",
40-
regs->pc, regs->regs[15], regs->sr);
39+
pr_info("PC : %08lx SP : %08lx SR : %08lx ", regs->pc,
40+
regs->regs[15], regs->sr);
4141
#ifdef CONFIG_MMU
42-
printk("TEA : %08x\n", __raw_readl(MMU_TEA));
42+
pr_cont("TEA : %08x\n", __raw_readl(MMU_TEA));
4343
#else
44-
printk("\n");
44+
pr_cont("\n");
4545
#endif
4646

47-
printk("R0 : %08lx R1 : %08lx R2 : %08lx R3 : %08lx\n",
48-
regs->regs[0],regs->regs[1],
49-
regs->regs[2],regs->regs[3]);
50-
printk("R4 : %08lx R5 : %08lx R6 : %08lx R7 : %08lx\n",
51-
regs->regs[4],regs->regs[5],
52-
regs->regs[6],regs->regs[7]);
53-
printk("R8 : %08lx R9 : %08lx R10 : %08lx R11 : %08lx\n",
54-
regs->regs[8],regs->regs[9],
55-
regs->regs[10],regs->regs[11]);
56-
printk("R12 : %08lx R13 : %08lx R14 : %08lx\n",
57-
regs->regs[12],regs->regs[13],
58-
regs->regs[14]);
59-
printk("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
60-
regs->mach, regs->macl, regs->gbr, regs->pr);
47+
pr_info("R0 : %08lx R1 : %08lx R2 : %08lx R3 : %08lx\n",
48+
regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3]);
49+
pr_info("R4 : %08lx R5 : %08lx R6 : %08lx R7 : %08lx\n",
50+
regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]);
51+
pr_info("R8 : %08lx R9 : %08lx R10 : %08lx R11 : %08lx\n",
52+
regs->regs[8], regs->regs[9], regs->regs[10], regs->regs[11]);
53+
pr_info("R12 : %08lx R13 : %08lx R14 : %08lx\n",
54+
regs->regs[12], regs->regs[13], regs->regs[14]);
55+
pr_info("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
56+
regs->mach, regs->macl, regs->gbr, regs->pr);
6157

6258
show_trace(NULL, (unsigned long *)regs->regs[15], regs, KERN_DEFAULT);
6359
show_code(regs);

0 commit comments

Comments
 (0)