leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/oops: Fix the oops markers to use pr_cont()

Browse Source 
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>
This commit is contained in:
Michael Ellerman
2017-08-23 23:56:20 +10:00
parent 6538ac3084
commit 72c0d9ee4a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/kernel/traps.c
View File

@@ -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); printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
printk("PREEMPT "); pr_cont("PREEMPT ");
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
printk("SMP NR_CPUS=%d ", NR_CPUS); pr_cont("SMP NR_CPUS=%d ", NR_CPUS);
#endif #endif
if (debug_pagealloc_enabled()) if (debug_pagealloc_enabled())
printk("DEBUG_PAGEALLOC "); pr_cont("DEBUG_PAGEALLOC ");
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
printk("NUMA "); pr_cont("NUMA ");
#endif #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) if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP)
return 1; return 1;