iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/oops: Fix missing pr_cont()s in show_regs()

Browse Source 
Fix up our oops output by converting continuation lines to use
pr_cont(). Some of these are dubious, eg. printing a continuation line
which starts with a newline, but seem to work OK for now. This whole
function needs a rewrite in the next release.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2016-11-03 20:45:26 +11:00
parent db5ba5ae6e
commit 7dae865f58
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/kernel/process.c
View File

@ -1347,29 +1347,29 @@ void show_regs(struct pt_regs * regs)
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
trap = TRAP(regs); trap = TRAP(regs);
if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR)) if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
printk("CFAR: "REG" ", regs->orig_gpr3); pr_cont("CFAR: "REG" ", regs->orig_gpr3);
if (trap == 0x200 || trap == 0x300 || trap == 0x600) if (trap == 0x200 || trap == 0x300 || trap == 0x600)
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
printk("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr); pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
#else #else
printk("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr); pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
#endif #endif
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
printk("SOFTE: %ld ", regs->softe); pr_cont("SOFTE: %ld ", regs->softe);
#endif #endif
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
if (MSR_TM_ACTIVE(regs->msr)) if (MSR_TM_ACTIVE(regs->msr))
printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch); pr_cont("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
#endif #endif
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if ((i % REGS_PER_LINE) == 0) if ((i % REGS_PER_LINE) == 0)
printk("\nGPR%02d: ", i); pr_cont("\nGPR%02d: ", i);
printk(REG " ", regs->gpr[i]); pr_cont(REG " ", regs->gpr[i]);
if (i == LAST_VOLATILE && !FULL_REGS(regs)) if (i == LAST_VOLATILE && !FULL_REGS(regs))
break; break;
} }
printk("\n"); pr_cont("\n");
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
/* /*
* Lookup NIP late so we have the best change of getting the * Lookup NIP late so we have the best change of getting the