diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 23:56:23 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-28 22:09:59 +1000 |
| commit | f6fc73fb965f6c1fd7ad75aabfdee6b1af0f7093 (patch) | |
| tree | ec7062cfcb3869d5821d653ef750da43400e905c /arch/powerpc/kernel/process.c | |
| parent | powerpc/oops: Use IS_ENABLED() for oops markers (diff) | |
| download | linux-dev-f6fc73fb965f6c1fd7ad75aabfdee6b1af0f7093.tar.xz linux-dev-f6fc73fb965f6c1fd7ad75aabfdee6b1af0f7093.zip | |
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: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 0a00d59df537..1e24d6f1be90 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -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); |