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

Commit f6fc73fb authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/oops: Print CR/XER on same line as MSR 



Somehow we missed this when the pr_cont() changes went in. Fix CR/XER
to go on the same line as MSR, as they have historically, eg:

  MSR: 8000000000009032 <SF,EE,ME,IR,DR,RI>  CR: 4804408a  XER: 20000000

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1c56cd8e

arch/powerpc/kernel/process.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1386,7 +1386,7 @@ void show_regs(struct pt_regs * regs) 
	       regs, regs->trap, print_tainted(), init_utsname()->release);

	       regs, regs->trap, print_tainted(), init_utsname()->release);

	printk("MSR: "REG" ", regs->msr);

	printk("MSR: "REG" ", regs->msr);

	print_msr_bits(regs->msr);

	print_msr_bits(regs->msr);

	printk("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);

	pr_cont("  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))

		pr_cont("CFAR: "REG" ", regs->orig_gpr3);

		pr_cont("CFAR: "REG" ", regs->orig_gpr3);