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

Commit 9122ee33 authored by Becky Bruce's avatar Becky Bruce Committed by Paul Mackerras
Browse files

[PATCH] ppc: Fix build warnings in arch/ppc/kernel/traps.c 



The latest updates to bug.h generate build warnings in traps.c in
arch/ppc.  Fix print format specifiers to account for change of line type
to long from int.

Signed-off-by: default avatarBecky Bruce <becky.bruce@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 8902e87f

arch/ppc/kernel/traps.c

+4 −4
Original line number Diff line number Diff line
@@ -606,22 +606,22 @@ int check_bug_trap(struct pt_regs *regs) 
	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:%d\n",

		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:%d\n",

		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:%d!\n",

	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:%d!\n",

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

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



	return 0;