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

Commit 72c0d9ee authored by Michael Ellerman's avatar Michael Ellerman
Browse files

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: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6538ac30

arch/powerpc/kernel/traps.c

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