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

Commit 570142ca authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

[PATCH] ppc64: remove some direct xmon calls 



Even though we can enable and disable xmon at runtime now, there are a
few places in the merge tree that call xmon and xmon_printf directly.

In the case below we call die() which will call xmon if it is enabled.

Also remove an unnecessary include of xmon.h in smp.c.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cb09cff3

arch/powerpc/kernel/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <asm/prom.h>

#include <asm/smp.h>

#include <asm/time.h>

#include <asm/xmon.h>

#include <asm/machdep.h>

#include <asm/cputable.h>

#include <asm/system.h>

arch/powerpc/kernel/traps.c

+0 −11
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <asm/io.h>

#include <asm/machdep.h>

#include <asm/rtas.h>

#include <asm/xmon.h>

#include <asm/pmc.h>

#ifdef CONFIG_PPC32

#include <asm/reg.h>
@@ -748,22 +747,12 @@ static int check_bug_trap(struct pt_regs *regs) 
		return 0;

	if (bug->line & BUG_WARNING_TRAP) {

		/* this is a WARN_ON rather than BUG/BUG_ON */

#ifdef CONFIG_XMON

		xmon_printf(KERN_ERR "Badness in %s at %s:%ld\n",

		       bug->function, bug->file,

		       bug->line & ~BUG_WARNING_TRAP);

#endif /* CONFIG_XMON */		

		printk(KERN_ERR "Badness in %s at %s:%ld\n",

		       bug->function, bug->file,

		       bug->line & ~BUG_WARNING_TRAP);

		dump_stack();

		return 1;

	}

#ifdef CONFIG_XMON

	xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",

	       bug->function, bug->file, bug->line);

	xmon(regs);

#endif /* CONFIG_XMON */

	printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",

	       bug->function, bug->file, bug->line);