Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dae865f authored by Michael Ellerman's avatar Michael Ellerman
Browse files

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



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: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent db5ba5ae

arch/powerpc/kernel/process.c

+8 −8
Original line number Diff line number Diff line
@@ -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