]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc/oops: Fix missing pr_cont()s in show_regs()
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 3 Nov 2016 09:45:26 +0000 (20:45 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 12 Nov 2016 09:12:50 +0000 (20:12 +1100)
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>
arch/powerpc/kernel/process.c

index 38f85d7a1e068a32c22af306acd436a523a158a7..6fe8fa481f8a14e267d72978d1af63a2784d4c0d 100644 (file)
@@ -1347,29 +1347,29 @@ void show_regs(struct pt_regs * regs)
        printk("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);
        trap = TRAP(regs);
        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 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
-               printk("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
+               pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
 #endif
 #ifdef CONFIG_PPC64
-       printk("SOFTE: %ld ", regs->softe);
+       pr_cont("SOFTE: %ld ", regs->softe);
 #endif
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
        if (MSR_TM_ACTIVE(regs->msr))
-               printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
+               pr_cont("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
 #endif
 
        for (i = 0;  i < 32;  i++) {
                if ((i % REGS_PER_LINE) == 0)
-                       printk("\nGPR%02d: ", i);
-               printk(REG " ", regs->gpr[i]);
+                       pr_cont("\nGPR%02d: ", i);
+               pr_cont(REG " ", regs->gpr[i]);
                if (i == LAST_VOLATILE && !FULL_REGS(regs))
                        break;
        }
-       printk("\n");
+       pr_cont("\n");
 #ifdef CONFIG_KALLSYMS
        /*
         * Lookup NIP late so we have the best change of getting the