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

[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
...@@ -606,22 +606,22 @@ int check_bug_trap(struct pt_regs *regs) ...@@ -606,22 +606,22 @@ int check_bug_trap(struct pt_regs *regs)
if (bug->line & BUG_WARNING_TRAP) { if (bug->line & BUG_WARNING_TRAP) {
/* this is a WARN_ON rather than BUG/BUG_ON */ /* this is a WARN_ON rather than BUG/BUG_ON */
#ifdef CONFIG_XMON #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->function, bug->file,
bug->line & ~BUG_WARNING_TRAP); bug->line & ~BUG_WARNING_TRAP);
#endif /* CONFIG_XMON */ #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->function, bug->file,
bug->line & ~BUG_WARNING_TRAP); bug->line & ~BUG_WARNING_TRAP);
dump_stack(); dump_stack();
return 1; return 1;
} }
#ifdef CONFIG_XMON #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); bug->function, bug->file, bug->line);
xmon(regs); xmon(regs);
#endif /* CONFIG_XMON */ #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); bug->function, bug->file, bug->line);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment