powerpc/oops: Print CR/XER on same line as MSR
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 23 Aug 2017 13:56:23 +0000 (23:56 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 28 Aug 2017 12:09:59 +0000 (22:09 +1000)
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: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/process.c

index 0a00d59df53747745ea7c63de3560b291a1105a4..1e24d6f1be90dda2059e470fa0c49c18721b9347 100644 (file)
@@ -1386,7 +1386,7 @@ void show_regs(struct pt_regs * regs)
               regs, regs->trap, print_tainted(), init_utsname()->release);
        printk("MSR: "REG" ", 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);
        if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
                pr_cont("CFAR: "REG" ", regs->orig_gpr3);