hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: Stop using pr_cont() in __die() 

Using pr_cont() risks having our output interleaved with other output
from other CPUs. Instead print everything in a single printk() call.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2019-01-10 22:57:35 +11:00
parent a65329aa7d
commit 782274434d
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,24 +257,14 @@ 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);
if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN)) printk("%s %s%s%s%s%s %s\n",
printk("LE "); IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",
else IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
printk("BE "); IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",
if (IS_ENABLED(CONFIG_PREEMPT)) debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
pr_cont("PREEMPT "); IS_ENABLED(CONFIG_NUMA) ? " NUMA" : "",
ppc_md.name ? ppc_md.name : "");
if (IS_ENABLED(CONFIG_SMP))
pr_cont("SMP NR_CPUS=%d ", NR_CPUS);
if (debug_pagealloc_enabled())
pr_cont("DEBUG_PAGEALLOC ");
if (IS_ENABLED(CONFIG_NUMA))
pr_cont("NUMA ");
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;