diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 23:56:20 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-28 22:09:58 +1000 |
| commit | 72c0d9ee4abc44c82a00eadebe08a740645ad8a0 (patch) | |
| tree | 2bb6681e64579b231b2553602fef1c702f3ae78e /arch/powerpc/kernel/traps.c | |
| parent | 6538ac30841638b2fd345725a9fd155c6fe1768a (diff) | |
| download | linux-72c0d9ee4abc44c82a00eadebe08a740645ad8a0.tar.gz | |
powerpc/oops: Fix the oops markers to use pr_cont()
When we oops we print a few markers for significant config options
such as PREEMPT, SMP etc. Currently these appear on separate lines
because we're not using pr_cont() properly. Fix it.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 675d5d2bfcdefa..82d0ce236f9dbd 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -203,17 +203,17 @@ static int __die(const char *str, struct pt_regs *regs, long err) { printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); #ifdef CONFIG_PREEMPT - printk("PREEMPT "); + pr_cont("PREEMPT "); #endif #ifdef CONFIG_SMP - printk("SMP NR_CPUS=%d ", NR_CPUS); + pr_cont("SMP NR_CPUS=%d ", NR_CPUS); #endif if (debug_pagealloc_enabled()) - printk("DEBUG_PAGEALLOC "); + pr_cont("DEBUG_PAGEALLOC "); #ifdef CONFIG_NUMA - printk("NUMA "); + pr_cont("NUMA "); #endif - printk("%s\n", ppc_md.name ? ppc_md.name : ""); + pr_cont("%s\n", ppc_md.name ? ppc_md.name : ""); if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP) return 1; |