Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78227443 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

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: default avatarMichael Ellerman <mpe@ellerman.id.au>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a65329aa

arch/powerpc/kernel/traps.c

+8 −18
Original line number Diff line number Diff line
@@ -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);



	if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))

		printk("LE ");

	else

		printk("BE ");



	if (IS_ENABLED(CONFIG_PREEMPT))

		pr_cont("PREEMPT ");



	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 : "");

	printk("%s %s%s%s%s%s %s\n",

	       IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",

	       IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",

	       IS_ENABLED(CONFIG_SMP) ? " SMP" : "",

	       IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",

	       debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",

	       IS_ENABLED(CONFIG_NUMA) ? " NUMA" : "",

	       ppc_md.name ? ppc_md.name : "");



	if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP)

		return 1;